updates

https://github.com/stjepang/polling/pull/10

.circleci/config.yml

@@ -189,6 +189,8 @@ workflows:
               only: /.*/
 
       - remote_python_packaging:
+          requires: 
+             - remote_tests_python
           filters:
             branches:
               only: master

.github/workflows/ci.yml

@@ -47,9 +47,7 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        # macOS disabled due to random failures related to caching
-        #os: [ubuntu-latest, windows-latest, macOS-latest]
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macOS-latest]
         rust: [1.45.0]
         experimental: [false]
 #        include:

CHANGELOG.md

@@ -1,135 +1,5 @@
 # Changelog 
 
-## 1.50.0
-
-- do not fetch emails in between inbox_watch disabled and enabled again #2087
-
-- fix: do not fetch from INBOX if inbox_watch is disabled #2085
-
-- fix: do not use STARTTLS when PLAIN connection is requested
-  and do not allow downgrade if STARTTLS is not available #2071
-
-
-## 1.49.0
-
-- add timestamps to image and video filenames #2068
-
-- forbid quoting messages from another context #2069
-
-- fix: preserve quotes in messages with attachments #2070
-
-
-## 1.48.0
-
-- `fetch_existing` renamed to `fetch_existing_msgs` and disabled by default
-  #2035 #2042
-
-- skip fetch existing messages/contacts if config-option `bot` set #2017
-
-- always log why a message is sorted to trash #2045
-
-- display a quote if top posting is detected #2047
-
-- add ephemeral task cancellation to `dc_stop_io()`;
-  before, there was no way to quickly terminate pending ephemeral tasks #2051
-
-- when saved-messages chat is deleted,
-  a device-message about recreation is added #2050
-
-- use `max_smtp_rcpt_to` from provider-db,
-  sending messages to many recipients in configurable chunks #2056
-
-- fix handling of empty autoconfigure files #2027
-
-- fix adding saved messages to wrong chats on multi-device #2034 #2039
-
-- fix hang on android4.4 and other systems
-  by adding a workaround to executer-blocking-handling bug #2040
-
-- fix secret key export/import roundtrip #2048
-
-- fix mistakenly unarchived chats #2057
-
-- fix outdated-reminder test that fails only 7 days a year,
-  including halloween :) #2059
-
-- improve python bindings #2021 #2036 #2038
-
-- update provider-database #2037
-
-
-## 1.47.0
-
-- breaking change: `dc_update_device_chats()` removed;
-  this is now done automatically during configure
-  unless the new config-option `bot` is set #1957
-
-- breaking change: split `DC_EVENT_MSGS_NOTICED` off `DC_EVENT_MSGS_CHANGED`
-  and remove `dc_marknoticed_all_chats()` #1942 #1981
-
-- breaking change: remove unused starring options #1965
-
-- breaking change: `DC_CHAT_TYPE_VERIFIED_GROUP` replaced by
-  `dc_chat_is_protected()`; also single-chats may be protected now, this may
-  happen over the wire even if the UI do not offer an option for that #1968
-
-- breaking change: split quotes off message text,
-  UIs should use at least `dc_msg_get_quoted_text()` to show quotes now #1975
-
-- new api for quote handling: `dc_msg_set_quote()`, `dc_msg_get_quoted_text()`,
-  `dc_msg_get_quoted_msg()` #1975 #1984 #1985 #1987 #1989 #2004
-
-- require quorum to enable encryption #1946
-
-- speed up and clean up account creation #1912 #1927 #1960 #1961
-
-- configure now collects recent contacts and fetches last messages
-  unless disabled by `fetch_existing` config-option #1913 #2003
-  EDIT: `fetch_existing` renamed to `fetch_existing_msgs` in 1.48.0 #2042
-
-- emit `DC_EVENT_CHAT_MODIFIED` on contact rename
-  and set contact-id on `DC_EVENT_CONTACTS_CHANGED` #1935 #1936 #1937
-
-- add `dc_set_chat_protection()`; the `protect` parameter in
-  `dc_create_group_chat()` will be removed in an upcoming release;
-  up to then, UIs using the "verified group" paradigm
-  should not use `dc_set_chat_protection()` #1968 #2014 #2001 #2012 #2007
-
-- remove unneeded `DC_STR_COUNT` #1991
-
-- mark all failed messages as failed when receiving an NDN #1993
-
-- check some easy cases for bad system clock and outdated app #1901
-
-- fix import temporary directory usage #1929
-
-- fix forcing encryption for reset peers #1998
-
-- fix: do not allow to save drafts in non-writeable chats #1997
-
-- fix: do not show HTML if there is no content and there is an attachment #1988
-
-- fix recovering offline/lost connections, fixes background receive bug #1983
-
-- fix ordering of accounts returned by `dc_accounts_get_all()` #1909
-
-- fix whitespace for summaries #1938
-
-- fix: improve sentbox name guessing #1941
-
-- fix: avoid manual poll impl for accounts events #1944
-
-- fix encoding newlines in param as a preparation for storing quotes #1945
-
-- fix: internal and ffi error handling #1967 #1966 #1959 #1911 #1916 #1917 #1915
-
-- fix ci #1928 #1931 #1932 #1933 #1934 #1943
-
-- update provider-database #1940 #2005 #2006
-
-- update dependencies #1919 #1908 #1950 #1963 #1996 #2010 #2013
-
-
 ## 1.46.0
 
 - breaking change: `dc_configure()` report errors in
@@ -875,3 +745,4 @@
 For a full list of changes, please see our closed Pull Requests: 
 
 https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
+

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.50.0"
+version = "1.46.0"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 license = "MPL-2.0"
@@ -12,12 +12,12 @@ lto = true
 deltachat_derive = { path = "./deltachat_derive" }
 
 libc = "0.2.51"
-pgp = { version = "0.7.0", default-features = false } 
+pgp = { version = "0.6.0", default-features = false } 
 hex = "0.4.0"
 sha2 = "0.9.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.4", default-features = false, features = ["h1-client"] }
 num-derive = "0.3.0"
 num-traits = "0.2.6"
 async-smtp = { git = "https://github.com/async-email/async-smtp", rev="2275fd8d13e39b2c58d6605c786ff06ff9e05708" }
@@ -25,7 +25,7 @@ email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 async-imap = "0.4.0"
 async-native-tls = { version = "0.3.3" }
-async-std = { version = "1.6.4", features = ["unstable"] }
+async-std = { version = "1.6.1", features = ["unstable"] }
 base64 = "0.12"
 charset = "0.1"
 percent-encoding = "2.0"
@@ -34,22 +34,22 @@ serde_json = "1.0"
 chrono = "0.4.6"
 indexmap = "1.3.0"
 kamadak-exif = "0.5"
-once_cell = "1.4.1"
+lazy_static = "1.4.0"
 regex = "1.1.6"
-rusqlite = { version = "0.24", features = ["bundled"] }
-r2d2_sqlite = "0.17.0"
+rusqlite = { version = "0.23", features = ["bundled"] }
+r2d2_sqlite = "0.16.0"
 r2d2 = "0.8.5"
-strum = "0.19.0"
-strum_macros = "0.19.0"
+strum = "0.18.0"
+strum_macros = "0.18.0"
 backtrace = "0.3.33"
 byteorder = "1.3.1"
 itertools = "0.9.0"
 quick-xml = "0.18.1"
 escaper = "0.1.0"
 bitflags = "1.1.0"
-sanitize-filename = "0.3.0"
+sanitize-filename = "0.2.1"
 stop-token = { version = "0.1.1", features = ["unstable"] }
-mailparse = "0.13.0"
+mailparse = "0.12.1"
 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"] }
@@ -61,8 +61,6 @@ url = "2.1.1"
 async-std-resolver = "0.19.5"
 async-tar = "0.3.0"
 uuid = { version = "0.8", features = ["serde", "v4"] }
-vcard = "0.4.6"
-ical = { version = "0.7.0", default-features = false, features = ["vcard"] }
 
 pretty_env_logger = { version = "0.4.0", optional = true }
 log = {version = "0.4.8", optional = true }
@@ -77,9 +75,8 @@ tempfile = "3.0"
 pretty_assertions = "0.6.1"
 pretty_env_logger = "0.4.0"
 proptest = "0.10"
-async-std = { version = "1.6.4", features = ["unstable", "attributes"] }
-futures-lite = "1.7.0"
-criterion = "0.3"
+async-std = { version = "1.6.0", features = ["unstable", "attributes"] }
+smol = "0.1.10"
 
 [workspace]
 members = [
@@ -98,10 +95,6 @@ path = "examples/repl/main.rs"
 required-features = ["repl"]
 
 
-[[bench]]
-name = "create_account"
-harness = false
-
 [features]
 default = []
 internals = []
@@ -109,3 +102,6 @@ repl = ["internals", "rustyline", "log", "pretty_env_logger", "ansi_term", "dirs
 vendored = ["async-native-tls/vendored", "async-smtp/native-tls-vendored"]
 nightly = ["pgp/nightly"]
 
+[patch.crates-io]
+polling = { git = "https://github.com/oblique/polling", branch = "master"}
+async-std = { git = "https://github.com/async-rs/async-std", branch = "master"}

benches/create_account.rs

@@ -1,26 +0,0 @@
-use async_std::path::PathBuf;
-use async_std::task::block_on;
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use deltachat::accounts::Accounts;
-use tempfile::tempdir;
-
-async fn create_accounts(n: u32) {
-    let dir = tempdir().unwrap();
-    let p: PathBuf = dir.path().join("accounts").into();
-
-    let accounts = Accounts::new("my_os".into(), p.clone()).await.unwrap();
-
-    for expected_id in 2..n {
-        let id = accounts.add_account().await.unwrap();
-        assert_eq!(id, expected_id);
-    }
-}
-
-fn criterion_benchmark(c: &mut Criterion) {
-    c.bench_function("create 1 account", |b| {
-        b.iter(|| block_on(async { create_accounts(black_box(1)).await }))
-    });
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);

ci_scripts/remote_python_packaging.sh

@@ -4,6 +4,8 @@ export BRANCH=${CIRCLE_BRANCH:?branch to build}
 export REPONAME=${CIRCLE_PROJECT_REPONAME:?repository name}
 export SSHTARGET=${SSHTARGET-ci@b1.delta.chat}
 
+# we construct the BUILDDIR such that we can easily share the
+# CARGO_TARGET_DIR between runs ("..")
 export BUILDDIR=ci_builds/$REPONAME/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number}
 
 echo "--- Copying files to $SSHTARGET:$BUILDDIR"

ci_scripts/remote_tests_python.sh

@@ -4,6 +4,8 @@ export BRANCH=${CIRCLE_BRANCH:?branch to build}
 export REPONAME=${CIRCLE_PROJECT_REPONAME:?repository name}
 export SSHTARGET=${SSHTARGET-ci@b1.delta.chat}
 
+# we construct the BUILDDIR such that we can easily share the
+# CARGO_TARGET_DIR between runs ("..")
 export BUILDDIR=ci_builds/$REPONAME/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number}
 
 echo "--- Copying files to $SSHTARGET:$BUILDDIR"
@@ -28,6 +30,9 @@ ssh $SSHTARGET <<_HERE
 
     export RUSTC_WRAPPER=\`which sccache\`
     cd $BUILDDIR
+    # let's share the target dir with our last run on this branch/job-type
+    # cargo will make sure to block/unblock us properly 
+    export CARGO_TARGET_DIR=\`pwd\`/../target
     export TARGET=release
     export DCC_PY_LIVECONFIG=$DCC_PY_LIVECONFIG
     export DCC_NEW_TMP_EMAIL=$DCC_NEW_TMP_EMAIL

ci_scripts/remote_tests_rust.sh

@@ -4,6 +4,8 @@ export BRANCH=${CIRCLE_BRANCH:?branch to build}
 export REPONAME=${CIRCLE_PROJECT_REPONAME:?repository name}
 export SSHTARGET=${SSHTARGET-ci@b1.delta.chat}
 
+# we construct the BUILDDIR such that we can easily share the
+# CARGO_TARGET_DIR between runs ("..")
 export BUILDDIR=ci_builds/$REPONAME/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number}
 
 set -e
@@ -22,6 +24,9 @@ ssh $SSHTARGET <<_HERE
     shopt -s huponexit
     export RUSTC_WRAPPER=\`which sccache\`
     cd $BUILDDIR
+    # let's share the target dir with our last run on this branch/job-type
+    # cargo will make sure to block/unblock us properly 
+    export CARGO_TARGET_DIR=\`pwd\`/../target
     export TARGET=x86_64-unknown-linux-gnu
     export RUSTC_WRAPPER=sccache
 

ci_scripts/run-python-test.sh

@@ -4,7 +4,6 @@
 # and tox/pytest. 
 
 set -e -x
-shopt -s huponexit
 
 # for core-building and python install step
 export DCC_RS_TARGET=debug

ci_scripts/run-rust-test.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 set -ex
-shopt -s huponexit
 
 #export RUST_TEST_THREADS=1
 export RUST_BACKTRACE=1

deltachat-ffi/Cargo.toml

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

deltachat-ffi/Doxyfile

@@ -236,6 +236,12 @@ TAB_SIZE               = 4
 
 ALIASES                =
 
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all

deltachat-ffi/src/lib.rs

@@ -25,7 +25,7 @@ use async_std::task::{block_on, spawn};
 use num_traits::{FromPrimitive, ToPrimitive};
 
 use deltachat::accounts::Accounts;
-use deltachat::chat::{ChatId, ChatVisibility, MuteDuration, ProtectionStatus};
+use deltachat::chat::{ChatId, ChatVisibility, MuteDuration};
 use deltachat::constants::DC_MSG_ID_LAST_SPECIAL;
 use deltachat::contact::{Contact, Origin};
 use deltachat::context::Context;
@@ -218,7 +218,7 @@ pub unsafe extern "C" fn dc_set_config_from_qr(
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn dc_get_info(context: *const dc_context_t) -> *mut libc::c_char {
+pub unsafe extern "C" fn dc_get_info(context: *mut dc_context_t) -> *mut libc::c_char {
     if context.is_null() {
         eprintln!("ignoring careless call to dc_get_info()");
         return "".strdup();
@@ -316,6 +316,7 @@ pub unsafe extern "C" fn dc_get_id(context: *mut dc_context_t) -> libc::c_int {
     ctx.get_id() as libc::c_int
 }
 
+#[no_mangle]
 pub type dc_event_t = Event;
 
 #[no_mangle]
@@ -362,7 +363,6 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
         | EventType::ErrorSelfNotInGroup(_) => 0,
         EventType::MsgsChanged { chat_id, .. }
         | EventType::IncomingMsg { chat_id, .. }
-        | EventType::MsgsNoticed(chat_id)
         | EventType::MsgDelivered { chat_id, .. }
         | EventType::MsgFailed { chat_id, .. }
         | EventType::MsgRead { chat_id, .. }
@@ -408,7 +408,6 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
         | EventType::ConfigureProgress { .. }
         | EventType::ImexProgress(_)
         | EventType::ImexFileWritten(_)
-        | EventType::MsgsNoticed(_)
         | EventType::ChatModified(_) => 0,
         EventType::MsgsChanged { msg_id, .. }
         | EventType::IncomingMsg { msg_id, .. }
@@ -448,7 +447,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
         }
         EventType::MsgsChanged { .. }
         | EventType::IncomingMsg { .. }
-        | EventType::MsgsNoticed(_)
         | EventType::MsgDelivered { .. }
         | EventType::MsgFailed { .. }
         | EventType::MsgRead { .. }
@@ -483,6 +481,7 @@ pub unsafe extern "C" fn dc_event_get_account_id(event: *mut dc_event_t) -> u32
     (*event).id
 }
 
+#[no_mangle]
 pub type dc_event_emitter_t = EventEmitter;
 
 #[no_mangle]
@@ -500,7 +499,7 @@ pub unsafe extern "C" fn dc_get_event_emitter(
 #[no_mangle]
 pub unsafe extern "C" fn dc_event_emitter_unref(emitter: *mut dc_event_emitter_t) {
     if emitter.is_null() {
-        eprintln!("ignoring careless call to dc_event_emitter_unref()");
+        eprintln!("ignoring careless call to dc_event_mitter_unref()");
         return;
     }
 
@@ -510,7 +509,6 @@ pub unsafe extern "C" fn dc_event_emitter_unref(emitter: *mut dc_event_emitter_t
 #[no_mangle]
 pub unsafe extern "C" fn dc_get_next_event(events: *mut dc_event_emitter_t) -> *mut dc_event_t {
     if events.is_null() {
-        eprintln!("ignoring careless call to dc_get_next_event()");
         return ptr::null_mut();
     }
     let events = &*events;
@@ -807,6 +805,21 @@ pub unsafe extern "C" fn dc_add_device_msg(
     .to_u32()
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn dc_update_device_chats(context: *mut dc_context_t) {
+    if context.is_null() {
+        eprintln!("ignoring careless call to dc_update_device_chats()");
+        return;
+    }
+    let ctx = &mut *context;
+
+    block_on(async move {
+        ctx.update_device_chats()
+            .await
+            .unwrap_or_log_default(&ctx, "Failed to add device message")
+    })
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn dc_was_device_msg_ever_added(
     context: *mut dc_context_t,
@@ -959,6 +972,22 @@ pub unsafe extern "C" fn dc_marknoticed_chat(context: *mut dc_context_t, chat_id
     })
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn dc_marknoticed_all_chats(context: *mut dc_context_t) {
+    if context.is_null() {
+        eprintln!("ignoring careless call to dc_marknoticed_all_chats()");
+        return;
+    }
+    let ctx = &*context;
+
+    block_on(async move {
+        chat::marknoticed_all_chats(&ctx)
+            .await
+            .log_err(ctx, "Failed marknoticed all chats")
+            .unwrap_or(())
+    })
+}
+
 fn from_prim<S, T>(s: S) -> Option<T>
 where
     T: FromPrimitive,
@@ -1042,32 +1071,6 @@ pub unsafe extern "C" fn dc_get_next_media(
     })
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_set_chat_protection(
-    context: *mut dc_context_t,
-    chat_id: u32,
-    protect: libc::c_int,
-) -> libc::c_int {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_set_chat_protection()");
-        return 0;
-    }
-    let ctx = &*context;
-    let protect = if let Some(s) = ProtectionStatus::from_i32(protect) {
-        s
-    } else {
-        warn!(ctx, "bad protect-value for dc_set_chat_protection()");
-        return 0;
-    };
-
-    block_on(async move {
-        match ChatId::new(chat_id).set_protection(&ctx, protect).await {
-            Ok(()) => 1,
-            Err(_) => 0,
-        }
-    })
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_set_chat_visibility(
     context: *mut dc_context_t,
@@ -1181,7 +1184,7 @@ pub unsafe extern "C" fn dc_get_chat(context: *mut dc_context_t, chat_id: u32) -
 #[no_mangle]
 pub unsafe extern "C" fn dc_create_group_chat(
     context: *mut dc_context_t,
-    protect: libc::c_int,
+    verified: libc::c_int,
     name: *const libc::c_char,
 ) -> u32 {
     if context.is_null() || name.is_null() {
@@ -1189,15 +1192,14 @@ pub unsafe extern "C" fn dc_create_group_chat(
         return 0;
     }
     let ctx = &*context;
-    let protect = if let Some(s) = ProtectionStatus::from_i32(protect) {
+    let verified = if let Some(s) = contact::VerifiedStatus::from_i32(verified) {
         s
     } else {
-        warn!(ctx, "bad protect-value for dc_create_group_chat()");
         return 0;
     };
 
     block_on(async move {
-        chat::create_group_chat(&ctx, protect, to_string_lossy(name))
+        chat::create_group_chat(&ctx, verified, to_string_lossy(name))
             .await
             .log_err(ctx, "Failed to create group chat")
             .map(|id| id.to_u32())
@@ -1476,6 +1478,23 @@ pub unsafe extern "C" fn dc_markseen_msgs(
     block_on(message::markseen_msgs(&ctx, msg_ids));
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn dc_star_msgs(
+    context: *mut dc_context_t,
+    msg_ids: *const u32,
+    msg_cnt: libc::c_int,
+    star: libc::c_int,
+) {
+    if context.is_null() || msg_ids.is_null() || msg_cnt <= 0 {
+        eprintln!("ignoring careless call to dc_star_msgs()");
+        return;
+    }
+    let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);
+    let ctx = &*context;
+
+    block_on(message::star_msgs(&ctx, msg_ids, star == 1));
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn dc_get_msg(context: *mut dc_context_t, msg_id: u32) -> *mut dc_msg_t {
     if context.is_null() {
@@ -1727,15 +1746,13 @@ pub unsafe extern "C" fn dc_imex(
 
     let ctx = &*context;
 
-    if let Some(param1) = to_opt_string_lossy(param1) {
-        spawn(async move {
-            imex::imex(&ctx, what, &param1)
-                .await
-                .log_err(ctx, "IMEX failed")
-        });
-    } else {
-        eprintln!("dc_imex called without a valid directory");
-    }
+    let param1 = to_opt_string_lossy(param1);
+
+    spawn(async move {
+        imex::imex(&ctx, what, param1)
+            .await
+            .log_err(ctx, "IMEX failed")
+    });
 }
 
 #[no_mangle]
@@ -1802,7 +1819,7 @@ pub unsafe extern "C" fn dc_continue_key_transfer(
         {
             Ok(()) => 1,
             Err(err) => {
-                warn!(&ctx, "dc_continue_key_transfer: {}", err);
+                error!(&ctx, "dc_continue_key_transfer: {}", err);
                 0
             }
         }
@@ -1972,6 +1989,7 @@ pub unsafe extern "C" fn dc_delete_all_locations(context: *mut dc_context_t) {
 
 // dc_array_t
 
+#[no_mangle]
 pub type dc_array_t = dc_array::dc_array_t;
 
 #[no_mangle]
@@ -2154,6 +2172,7 @@ pub struct ChatlistWrapper {
     list: chatlist::Chatlist,
 }
 
+#[no_mangle]
 pub type dc_chatlist_t = ChatlistWrapper;
 
 #[no_mangle]
@@ -2277,6 +2296,7 @@ pub struct ChatWrapper {
     chat: chat::Chat,
 }
 
+#[no_mangle]
 pub type dc_chat_t = ChatWrapper;
 
 #[no_mangle]
@@ -2403,13 +2423,13 @@ pub unsafe extern "C" fn dc_chat_can_send(chat: *mut dc_chat_t) -> libc::c_int {
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn dc_chat_is_protected(chat: *mut dc_chat_t) -> libc::c_int {
+pub unsafe extern "C" fn dc_chat_is_verified(chat: *mut dc_chat_t) -> libc::c_int {
     if chat.is_null() {
-        eprintln!("ignoring careless call to dc_chat_is_protected()");
+        eprintln!("ignoring careless call to dc_chat_is_verified()");
         return 0;
     }
     let ffi_chat = &*chat;
-    ffi_chat.chat.is_protected() as libc::c_int
+    ffi_chat.chat.is_verified() as libc::c_int
 }
 
 #[no_mangle]
@@ -2502,6 +2522,7 @@ pub struct MessageWrapper {
     message: message::Message,
 }
 
+#[no_mangle]
 pub type dc_msg_t = MessageWrapper;
 
 #[no_mangle]
@@ -2811,6 +2832,16 @@ pub unsafe extern "C" fn dc_msg_is_sent(msg: *mut dc_msg_t) -> libc::c_int {
     ffi_msg.message.is_sent().into()
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn dc_msg_is_starred(msg: *mut dc_msg_t) -> libc::c_int {
+    if msg.is_null() {
+        eprintln!("ignoring careless call to dc_msg_is_starred()");
+        return 0;
+    }
+    let ffi_msg = &*msg;
+    ffi_msg.message.is_starred().into()
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn dc_msg_is_forwarded(msg: *mut dc_msg_t) -> libc::c_int {
     if msg.is_null() {
@@ -2831,16 +2862,6 @@ pub unsafe extern "C" fn dc_msg_is_info(msg: *mut dc_msg_t) -> libc::c_int {
     ffi_msg.message.is_info().into()
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_msg_get_info_type(msg: *mut dc_msg_t) -> libc::c_int {
-    if msg.is_null() {
-        eprintln!("ignoring careless call to dc_msg_get_info_type()");
-        return 0;
-    }
-    let ffi_msg = &*msg;
-    ffi_msg.message.get_info_type() as libc::c_int
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_msg_is_increation(msg: *mut dc_msg_t) -> libc::c_int {
     if msg.is_null() {
@@ -2986,79 +3007,6 @@ pub unsafe extern "C" fn dc_msg_latefiling_mediasize(
     });
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_msg_get_error(msg: *mut dc_msg_t) -> *mut libc::c_char {
-    if msg.is_null() {
-        eprintln!("ignoring careless call to dc_msg_get_error()");
-        return ptr::null_mut();
-    }
-    let ffi_msg = &*msg;
-    match ffi_msg.message.error() {
-        Some(error) => error.strdup(),
-        None => ptr::null_mut(),
-    }
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_msg_set_quote(msg: *mut dc_msg_t, quote: *const dc_msg_t) {
-    if msg.is_null() {
-        eprintln!("ignoring careless call to dc_msg_set_quote()");
-        return;
-    }
-    let ffi_msg = &mut *msg;
-    let ffi_quote = &*quote;
-
-    if ffi_msg.context != ffi_quote.context {
-        eprintln!("ignoring attempt to quote message from a different context");
-        return;
-    }
-
-    block_on(async move {
-        ffi_msg
-            .message
-            .set_quote(&*ffi_msg.context, &ffi_quote.message)
-            .await
-            .log_err(&*ffi_msg.context, "failed to set quote")
-            .ok();
-    });
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_msg_get_quoted_text(msg: *const dc_msg_t) -> *mut libc::c_char {
-    if msg.is_null() {
-        eprintln!("ignoring careless call to dc_msg_get_quoted_text()");
-        return ptr::null_mut();
-    }
-    let ffi_msg: &MessageWrapper = &*msg;
-    ffi_msg
-        .message
-        .quoted_text()
-        .map_or_else(ptr::null_mut, |s| s.strdup())
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_msg_get_quoted_msg(msg: *const dc_msg_t) -> *mut dc_msg_t {
-    if msg.is_null() {
-        eprintln!("ignoring careless call to dc_get_quoted_msg()");
-        return ptr::null_mut();
-    }
-    let ffi_msg: &MessageWrapper = &*msg;
-    let context = &*ffi_msg.context;
-    let res = block_on(async move {
-        ffi_msg
-            .message
-            .quoted_message(context)
-            .await
-            .log_err(context, "failed to get quoted message")
-            .unwrap_or(None)
-    });
-
-    match res {
-        Some(message) => Box::into_raw(Box::new(MessageWrapper { context, message })),
-        None => ptr::null_mut(),
-    }
-}
-
 // dc_contact_t
 
 /// FFI struct for [dc_contact_t]
@@ -3073,6 +3021,7 @@ pub struct ContactWrapper {
     contact: contact::Contact,
 }
 
+#[no_mangle]
 pub type dc_contact_t = ContactWrapper;
 
 #[no_mangle]
@@ -3205,6 +3154,7 @@ pub unsafe extern "C" fn dc_contact_is_verified(contact: *mut dc_contact_t) -> l
 
 // dc_lot_t
 
+#[no_mangle]
 pub type dc_lot_t = lot::Lot;
 
 #[no_mangle]
@@ -3313,8 +3263,7 @@ impl<T: Default, E: std::fmt::Display> ResultExt<T, E> for Result<T, E> {
 
     fn log_err(self, ctx: &Context, message: &str) -> Result<T, E> {
         self.map_err(|err| {
-            // We are using Anyhow's .context() and to show the inner error, too, we need the {:#}:
-            warn!(ctx, "{}: {:#}", message, err);
+            warn!(ctx, "{}: {}", message, err);
             err
         })
     }
@@ -3346,6 +3295,7 @@ fn convert_and_prune_message_ids(msg_ids: *const u32, msg_cnt: libc::c_int) -> V
 
 // dc_provider_t
 
+#[no_mangle]
 pub type dc_provider_t = provider::Provider;
 
 #[no_mangle]
@@ -3436,8 +3386,7 @@ pub unsafe extern "C" fn dc_accounts_new(
     match accs {
         Ok(accs) => Box::into_raw(Box::new(accs)),
         Err(err) => {
-            // We are using Anyhow's .context() and to show the inner error, too, we need the {:#}:
-            eprintln!("failed to create accounts: {:#}", err);
+            eprintln!("failed to create accounts: {}", err);
             ptr::null_mut()
         }
     }
@@ -3498,7 +3447,7 @@ pub unsafe extern "C" fn dc_accounts_select_account(
     let accounts = &*accounts;
     block_on(accounts.select_account(id))
         .map(|_| 1)
-        .unwrap_or(0)
+        .unwrap_or_else(|_| 0)
 }
 
 #[no_mangle]
@@ -3510,7 +3459,7 @@ pub unsafe extern "C" fn dc_accounts_add_account(accounts: *mut dc_accounts_t) -
 
     let accounts = &*accounts;
 
-    block_on(accounts.add_account()).unwrap_or(0)
+    block_on(accounts.add_account()).unwrap_or_else(|_| 0)
 }
 
 #[no_mangle]
@@ -3612,6 +3561,7 @@ pub unsafe extern "C" fn dc_accounts_maybe_network(accounts: *mut dc_accounts_t)
     block_on(accounts.maybe_network());
 }
 
+#[no_mangle]
 pub type dc_accounts_event_emitter_t = deltachat::accounts::EventEmitter;
 
 #[no_mangle]
@@ -3645,10 +3595,9 @@ pub unsafe extern "C" fn dc_accounts_get_next_event(
     emitter: *mut dc_accounts_event_emitter_t,
 ) -> *mut dc_event_t {
     if emitter.is_null() {
-        eprintln!("ignoring careless call to dc_accounts_get_next_event()");
         return ptr::null_mut();
     }
-    let emitter = &mut *emitter;
+    let emitter = &*emitter;
 
     emitter
         .recv_sync()

draft/group-sync.rst

@@ -5,95 +5,69 @@ Problem: missing eventual group consistency
 If group members are concurrently adding new members,
 the new members will miss each other's additions, example:
 
-1. Alice and Bob are in a two-member group
+- Alice and Bob are in a two-member group
 
-2. Then Alice adds Carol, while concurrently Bob adds Doris
+- Alice adds Carol, concurrently Bob adds Doris
 
-Right now, the group has inconsistent memberships:
+- Carol will see a three-member group (Alice, Bob, Carol),
+  Doris will see a different three-member group (Alice, Bob, Doris),
+  and only Alice and Bob will have all four members.
 
-- Alice and Carol see a (Alice, Carol, Bob) group
-
-- Bob and Doris see a (Bob, Doris, Alice)
-
-This then leads to "sender is unknown" messages in the chat,
-for example when Alice receives a message from Doris,
-or when Bob receives a message from Carol.
-
-There are also other sources for group membership inconsistency:
-
-- leaving/deleting/adding in larger groups, while being offline,
-  increases chances for inconsistent group membership
-
-- dropped group-membership messages
-
-- group-membership messages landing in "Spam"
+Note that for verified groups any mitigation mechanism likely
+needs to make all clients to know who originally added a member.
 
 
-Note that all these problems (can) also happen with verified groups,
-then raising "false alarms" which could lure people to ignore such issues.
+solution: memorize+attach (possible encrypted) chat-meta mime messages
+----------------------------------------------------------------------
 
-IOW, it's clear we need to do something about it to improve overall
-reliability in group-settings.
+For reference, please see https://github.com/deltachat/deltachat-core-rust/blob/master/spec.md#add-and-remove-members how MemberAdded/Removed messages are shaped.
 
 
+- All Chat-Group-Member-Added/Removed messages are recorded in their
+  full raw (signed and encrypted) mime-format in the DB
 
-Solution: replay group modification messages on inconsistencies
-------------------------------------------------------------------
+- If an incoming member-add/member-delete messages has a member list
+  which is, apart from the added/removed member, not consistent
+  with our own view, broadcast a "Chat-Group-Member-Correction" message to
+  all members, attaching the original added/removed mime-message for all mismatching
+  contacts.  If we have no relevant add/del information, don't send a
+  correction message out.
 
-For brevity let's abbreviate "group membership modification" as **GMM**.
+- Upong receiving added/removed attachments we don't do the
+  check_consistency+correction message dance.
+  This avoids recursion problems and hard-to-reason-about chatter.
 
-Delta chat has explicit GMM messages, typically encrypted to the group members
-as seen by the device that sends the GMM. The `Spec <https://github.com/deltachat/deltachat-core-rust/blob/master/spec.md#add-and-remove-members>`_ details the Mime headers and format.
+Notes:
 
-If we detect membership inconsistencies we can resend relevant GMM messages
-to the respective chat.  The receiving devices can process those GMM messages
-as if it would be an incoming message. If for example they have already seen
-the Message-ID of the GMM message, they will ignore the message. It's
-probably useful to record GMM message in their original MIME-format and
-not invent a new recording format. Few notes on three aspects:
+- mechanism works for both encrypted and unencrypted add/del messages
 
-- **group-membership-tracking**: All valid GMM messages are persisted in
-  their full raw (signed/encrypted?) MIME-format in the DB. Note that GMM messages
-  already are in the msgs table, and there is a mime_header column which we could
-  extend to contain the raw Mime GMM message.
+- we already have a "mime_headers" column in the DB for each incoming message.
+  We could extend it to also include the payload and store mime unconditionally
+  for member-added/removed messages.
 
-- **consistency_checking**: If an incoming GMM has a member list which is
-  not consistent with our own view, broadcast a "Group-Member-Correction"
-  message to all members containing a multipart list of GMMs.
+- multiple member-added/removed messages can be attached in a single
+  correction message
 
-- **correcting_memberships**: Upon receiving a Group-Member-Correction
-  message we pass the contained GMMs to the "incoming mail pipeline"
-  (without **consistency_checking** them, to avoid recursion issues)
+- it is minimal on the number of overall messages to reach group consistency
+  (best-case: no extra messages, the ABCD case above: max two extra messages)
 
+- somewhat backward compatible: older clients will probably ignore
+  messages which are signed by someone who is not the outer From-address.
 
-Alice/Carol and Bob/Doris getting on the same page
-++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Recall that Alice/Carol and Bob/Doris had a differening view of
-group membership. With the proposed solution, when Bob receives
-Alice's "Carol added" message, he will notice that Alice (and thus
-also carol) did not know about Doris.  Bob's device sends a
-"Chat-Group-Member-Correction" message containing his own GMM
-when adding Doris. Therefore, the group's membership is healed
-for everyone in a single broadcast message.
-
-Alice might also send a Group-member-Correction message,
-so there is a second chance that the group gets to know all GMMs.
-
-Note, for example, that if for some reason Bobs and Carols provider
-drop GMM messages between them (spam) that Alice and Doris can heal
-it by resending GMM messages whenever they detect them to be out of sync.
+- the correction-protocol also helps with dropped messages.  If a member
+  did not see a member-added/removed message, the next member add/removed
+  message in the group will likely heal group consistency for this member.
 
+- we can quite easily extend the mechanism to also provide the group-avatar or
+  other meta-information.
 
 Discussions of variants
 ++++++++++++++++++++++++
 
-- instead of acting on GMM messages we could send corrections
-  for any received message that addresses inconsistent group members but
-  a) this could delay group-membership healing
+- instead of acting on MemberAdded/Removed message we could send
+  corrections for any received message that addresses inconsistent group members but
+  a) this would delay group-membership healing
   b) could lead to a lot of members sending corrections
-  c) means we might rely on "To-Addresses" which we also like to strike
-     at least for protected chats.
 
 - instead of broadcasting correction messages we could only send it to
   the sender of the inconsistent member-added/removed message.
@@ -109,3 +83,44 @@ Discussions of variants
   while both being in an offline or bad-connection situation).
 
 
+solution2: repeat member-added/removed messages
+---------------------------------------------------
+
+Introduce a new Chat-Group-Member-Changed header and deprecate Chat-Group-Member-Added/Removed
+but keep sending out the old headers until the new protocol is sufficiently deployed.
+
+The new Chat-Group-Member-Changed header contains a Time-to-Live number (TTL)
+which controls repetition of the signed "add/del e-mail address" payload.
+
+Example::
+
+    Chat-Group-Member-Changed: TTL add "somedisplayname" someone@example.org
+        owEBYQGe/pANAwACAY47A6J5t3LWAcsxYgBeTQypYWRkICJzb21lZGlzcGxheW5h
+        bWUiIHNvbWVvbmVAZXhhbXBsZS5vcmcgCokBHAQAAQIABgUCXk0MqQAKCRCOOwOi
+        ebdy1hfRB/wJ74tgFQulicthcv9n+ZsqzwOtBKMEVIHqJCzzDB/Hg/2z8ogYoZNR
+        iUKKrv3Y1XuFvdKyOC+wC/unXAWKFHYzY6Tv6qDp6r+amt+ad+8Z02q53h9E55IP
+        FUBdq2rbS8hLGjQB+mVRowYrUACrOqGgNbXMZjQfuV7fSc7y813OsCQgi3tjstup
+        b+uduVzxCp3PChGhcZPs3iOGCnQvSB8VAaLGMWE2d7nTo/yMQ0Jx69x5qwfXogTk
+        mTt5rOJyrosbtf09TMKFzGgtqBcEqHLp3+mQpZQ+WHUKAbsRa8Jc9DOUOSKJ8SNM
+        clKdskprY+4LY0EBwLD3SQ7dPkTITCRD
+        =P6GG
+
+TTL is set to "2" on an initial Chat-Group-Member-Changed add/del message.
+Receivers will apply the add/del change to the group-membership,
+decrease the TTL by 1, and if TTL>0 re-sent the header.
+
+The "add|del e-mail address" payload is pgp-signed and repeated verbatim.
+This allows to propagate, in a cryptographically secured way,
+who added a member. This is particularly important for allowing
+to show in verified groups who added a member (planned).
+
+Disadvantage to solution 1:
+
+- requires to specify encoding and precise rules for what/how is signed.
+
+- causes O(N^2) extra messages
+
+- Not easily extendable for other things (without introducing a new
+  header / encoding)
+
+

examples/repl/cmdline.rs

@@ -4,7 +4,7 @@ use std::str::FromStr;
 
 use anyhow::{bail, ensure};
 use async_std::path::Path;
-use deltachat::chat::{self, Chat, ChatId, ChatItem, ChatVisibility, ProtectionStatus};
+use deltachat::chat::{self, Chat, ChatId, ChatItem, ChatVisibility};
 use deltachat::chatlist::*;
 use deltachat::constants::*;
 use deltachat::contact::*;
@@ -185,7 +185,7 @@ async fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
     let temp2 = dc_timestamp_to_str(msg.get_timestamp());
     let msgtext = msg.get_text();
     println!(
-        "{}{}{}{}: {} (Contact#{}): {} {}{}{}{}{} [{}]",
+        "{}{}{}{}: {} (Contact#{}): {} {}{}{}{}{}{} [{}]",
         prefix.as_ref(),
         msg.get_id(),
         if msg.get_showpadlock() { "🔒" } else { "" },
@@ -193,6 +193,7 @@ async fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
         &contact_name,
         contact_id,
         msgtext.unwrap_or_default(),
+        if msg.is_starred() { "★" } else { "" },
         if msg.get_from_id() == 1 as libc::c_uint {
             ""
         } else if msg.get_state() == MessageState::InSeen {
@@ -357,7 +358,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  createchat <contact-id>\n\
                  createchatbymsg <msg-id>\n\
                  creategroup <name>\n\
-                 createprotected <name>\n\
+                 createverified <name>\n\
                  addmember <contact-id>\n\
                  removemember <contact-id>\n\
                  groupname <name>\n\
@@ -379,8 +380,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  unarchive <chat-id>\n\
                  pin <chat-id>\n\
                  unpin <chat-id>\n\
-                 protect <chat-id>\n\
-                 unprotect <chat-id>\n\
                  delchat <chat-id>\n\
                  ===========================Message commands==\n\
                  listmsgs <query>\n\
@@ -388,6 +387,8 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  listfresh\n\
                  forward <msg-id> <chat-id>\n\
                  markseen <msg-id>\n\
+                 star <msg-id>\n\
+                 unstar <msg-id>\n\
                  delmsg <msg-id>\n\
                  ===========================Contact commands==\n\
                  listcontacts [<query>]\n\
@@ -443,20 +444,20 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
         }
         "export-backup" => {
             let dir = dirs::home_dir().unwrap_or_default();
-            imex(&context, ImexMode::ExportBackup, &dir).await?;
+            imex(&context, ImexMode::ExportBackup, Some(&dir)).await?;
             println!("Exported to {}.", dir.to_string_lossy());
         }
         "import-backup" => {
             ensure!(!arg1.is_empty(), "Argument <backup-file> missing.");
-            imex(&context, ImexMode::ImportBackup, arg1).await?;
+            imex(&context, ImexMode::ImportBackup, Some(arg1)).await?;
         }
         "export-keys" => {
             let dir = dirs::home_dir().unwrap_or_default();
-            imex(&context, ImexMode::ExportSelfKeys, &dir).await?;
+            imex(&context, ImexMode::ExportSelfKeys, Some(&dir)).await?;
             println!("Exported to {}.", dir.to_string_lossy());
         }
         "import-keys" => {
-            imex(&context, ImexMode::ImportSelfKeys, arg1).await?;
+            imex(&context, ImexMode::ImportSelfKeys, Some(arg1)).await?;
         }
         "export-setup" => {
             let setup_code = create_setup_code(&context);
@@ -525,7 +526,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 for i in (0..cnt).rev() {
                     let chat = Chat::load_from_db(&context, chatlist.get_chat_id(i)).await?;
                     println!(
-                        "{}#{}: {} [{} fresh] {}{}",
+                        "{}#{}: {} [{} fresh] {}",
                         chat_prefix(&chat),
                         chat.get_id(),
                         chat.get_name(),
@@ -535,7 +536,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                             ChatVisibility::Archived => "📦",
                             ChatVisibility::Pinned => "📌",
                         },
-                        if chat.is_protected() { "🛡️" } else { "" },
                     );
                     let lot = chatlist.get_summary(&context, i, Some(&chat)).await;
                     let statestr = if chat.visibility == ChatVisibility::Archived {
@@ -610,7 +610,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 format!("{} member(s)", members.len())
             };
             println!(
-                "{}#{}: {} [{}]{}{} {}",
+                "{}#{}: {} [{}]{}{}",
                 chat_prefix(sel_chat),
                 sel_chat.get_id(),
                 sel_chat.get_name(),
@@ -627,11 +627,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                     },
                     _ => "".to_string(),
                 },
-                if sel_chat.is_protected() {
-                    "🛡️"
-                } else {
-                    ""
-                },
             );
             log_msglist(&context, &msglist).await?;
             if let Some(draft) = sel_chat.get_id().get_draft(&context).await? {
@@ -662,16 +657,15 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
         "creategroup" => {
             ensure!(!arg1.is_empty(), "Argument <name> missing.");
             let chat_id =
-                chat::create_group_chat(&context, ProtectionStatus::Unprotected, arg1).await?;
+                chat::create_group_chat(&context, VerifiedStatus::Unverified, arg1).await?;
 
             println!("Group#{} created successfully.", chat_id);
         }
-        "createprotected" => {
+        "createverified" => {
             ensure!(!arg1.is_empty(), "Argument <name> missing.");
-            let chat_id =
-                chat::create_group_chat(&context, ProtectionStatus::Protected, arg1).await?;
+            let chat_id = chat::create_group_chat(&context, VerifiedStatus::Verified, arg1).await?;
 
-            println!("Group#{} created and protected successfully.", chat_id);
+            println!("VerifiedGroup#{} created successfully.", chat_id);
         }
         "addmember" => {
             ensure!(sel_chat.is_some(), "No chat selected");
@@ -881,6 +875,9 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             msg.set_text(Some(arg1.to_string()));
             chat::add_device_msg(&context, None, Some(&mut msg)).await?;
         }
+        "updatedevicechats" => {
+            context.update_device_chats().await?;
+        }
         "listmedia" => {
             ensure!(sel_chat.is_some(), "No chat selected.");
 
@@ -912,21 +909,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                         "archive" => ChatVisibility::Archived,
                         "unarchive" | "unpin" => ChatVisibility::Normal,
                         "pin" => ChatVisibility::Pinned,
-                        _ => unreachable!("arg0={:?}", arg0),
-                    },
-                )
-                .await?;
-        }
-        "protect" | "unprotect" => {
-            ensure!(!arg1.is_empty(), "Argument <chat-id> missing.");
-            let chat_id = ChatId::new(arg1.parse()?);
-            chat_id
-                .set_protection(
-                    &context,
-                    match arg0 {
-                        "protect" => ProtectionStatus::Protected,
-                        "unprotect" => ProtectionStatus::Unprotected,
-                        _ => unreachable!("arg0={:?}", arg0),
+                        _ => panic!("Unexpected command (This should never happen)"),
                     },
                 )
                 .await?;
@@ -965,6 +948,12 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             msg_ids[0] = MsgId::new(arg1.parse()?);
             message::markseen_msgs(&context, msg_ids).await;
         }
+        "star" | "unstar" => {
+            ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
+            let mut msg_ids = vec![MsgId::new(0); 1];
+            msg_ids[0] = MsgId::new(arg1.parse()?);
+            message::star_msgs(&context, msg_ids, arg0 == "star").await;
+        }
         "delmsg" => {
             ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
             let mut ids = [MsgId::new(0); 1];

examples/repl/main.rs

@@ -197,12 +197,14 @@ const CHAT_COMMANDS: [&str; 27] = [
     "unpin",
     "delchat",
 ];
-const MESSAGE_COMMANDS: [&str; 6] = [
+const MESSAGE_COMMANDS: [&str; 8] = [
     "listmsgs",
     "msginfo",
     "listfresh",
     "forward",
     "markseen",
+    "star",
+    "unstar",
     "delmsg",
 ];
 const CONTACT_COMMANDS: [&str; 6] = [

python/src/deltachat/__init__.py

@@ -77,7 +77,6 @@ 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")
-        ac.set_config("bot", "1")
         configtracker = ac.configure()
         configtracker.wait_finish()
 

python/src/deltachat/account.py

@@ -214,19 +214,6 @@ class Account(object):
         :param name: (optional) display name for this contact
         :returns: :class:`deltachat.contact.Contact` instance.
         """
-        (name, addr) = self.get_contact_addr_and_name(obj, name)
-        name = as_dc_charpointer(name)
-        addr = as_dc_charpointer(addr)
-        contact_id = lib.dc_create_contact(self._dc_context, name, addr)
-        return Contact(self, contact_id)
-
-    def get_contact(self, obj):
-        if isinstance(obj, Contact):
-            return obj
-        (_, addr) = self.get_contact_addr_and_name(obj)
-        return self.get_contact_by_addr(addr)
-
-    def get_contact_addr_and_name(self, obj, name=None):
         if isinstance(obj, Account):
             if not obj.is_configured():
                 raise ValueError("can only add addresses from configured accounts")
@@ -242,7 +229,13 @@ class Account(object):
 
         if name is None and displayname:
             name = displayname
-        return (name, addr)
+        return self._create_contact(addr, name)
+
+    def _create_contact(self, addr, name):
+        addr = as_dc_charpointer(addr)
+        name = as_dc_charpointer(name)
+        contact_id = lib.dc_create_contact(self._dc_context, name, addr)
+        return Contact(self, contact_id)
 
     def delete_contact(self, contact):
         """ delete a Contact.
@@ -270,17 +263,6 @@ class Account(object):
         """
         return Contact(self, contact_id)
 
-    def get_blocked_contacts(self):
-        """ return a list of all blocked contacts.
-
-        :returns: list of :class:`deltachat.contact.Contact` objects.
-        """
-        dc_array = ffi.gc(
-            lib.dc_get_blocked_contacts(self._dc_context),
-            lib.dc_array_unref
-        )
-        return list(iter_array(dc_array, lambda x: Contact(self, x)))
-
     def get_contacts(self, query=None, with_self=False, only_verified=False):
         """ get a (filtered) list of contacts.
 
@@ -354,9 +336,6 @@ class Account(object):
     def get_deaddrop_chat(self):
         return Chat(self, const.DC_CHAT_ID_DEADDROP)
 
-    def get_device_chat(self):
-        return Contact(self, const.DC_CONTACT_ID_DEVICE).create_chat()
-
     def get_message_by_id(self, msg_id):
         """ return Message instance.
         :param msg_id: integer id of this message.
@@ -567,9 +546,6 @@ class Account(object):
         You may call `stop_scheduler`, `wait_shutdown` or `shutdown` after the
         account is started.
 
-        If you are using this from a test, you may want to call
-        wait_all_initial_fetches() afterwards.
-
         :raises MissingCredentials: if `addr` and `mail_pw` values are not set.
         :raises ConfigureFailed: if the account could not be configured.
 

python/src/deltachat/chat.py

@@ -57,7 +57,10 @@ class Chat(object):
 
         :returns: True if chat is a group-chat, false if it's a contact 1:1 chat.
         """
-        return lib.dc_chat_get_type(self._dc_chat) == const.DC_CHAT_TYPE_GROUP
+        return lib.dc_chat_get_type(self._dc_chat) in (
+            const.DC_CHAT_TYPE_GROUP,
+            const.DC_CHAT_TYPE_VERIFIED_GROUP
+        )
 
     def is_deaddrop(self):
         """ return true if this chat is a deaddrop chat.
@@ -82,20 +85,12 @@ class Chat(object):
         """
         return not lib.dc_chat_is_unpromoted(self._dc_chat)
 
-    def can_send(self):
-        """Check if messages can be sent to a give chat.
-        This is not true eg. for the deaddrop or for the device-talk
+    def is_verified(self):
+        """ return True if this chat is a verified group.
 
-        :returns: True if the chat is writable, False otherwise
+        :returns: True if chat is verified, False otherwise.
         """
-        return lib.dc_chat_can_send(self._dc_chat)
-
-    def is_protected(self):
-        """ return True if this chat is a protected chat.
-
-        :returns: True if chat is protected, False otherwise.
-        """
-        return lib.dc_chat_is_protected(self._dc_chat)
+        return lib.dc_chat_is_verified(self._dc_chat)
 
     def get_name(self):
         """ return name of this chat.
@@ -371,7 +366,7 @@ class Chat(object):
         :raises ValueError: if contact could not be removed
         :returns: None
         """
-        contact = self.account.get_contact(obj)
+        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))

python/src/deltachat/contact.py

@@ -52,17 +52,9 @@ class Contact(object):
         return lib.dc_contact_is_blocked(self._dc_contact)
 
     def set_blocked(self, block=True):
-        """ [Deprecated, use block/unblock methods] Block or unblock a contact. """
+        """ Block or unblock a contact. """
         return lib.dc_block_contact(self.account._dc_context, self.id, block)
 
-    def block(self):
-        """ Block this contact. Message will not be seen/retrieved from this contact. """
-        return lib.dc_block_contact(self.account._dc_context, self.id, True)
-
-    def unblock(self):
-        """ Unblock this contact. Messages from this contact will be retrieved (again)."""
-        return lib.dc_block_contact(self.account._dc_context, self.id, False)
-
     def is_verified(self):
         """ Return True if the contact is verified. """
         return lib.dc_contact_is_verified(self._dc_contact)

python/src/deltachat/direct_imap.py

@@ -24,13 +24,12 @@ def dc_account_extra_configure(account):
     """ Reset the account (we reuse accounts across tests)
     and make 'account.direct_imap' available for direct IMAP ops.
     """
-    if not hasattr(account, "direct_imap"):
-        imap = DirectImap(account)
-        if imap.select_config_folder("mvbox"):
-            imap.delete(ALL, expunge=True)
-        assert imap.select_config_folder("inbox")
+    imap = DirectImap(account)
+    if imap.select_config_folder("mvbox"):
         imap.delete(ALL, expunge=True)
-        setattr(account, "direct_imap", imap)
+    assert imap.select_config_folder("inbox")
+    imap.delete(ALL, expunge=True)
+    setattr(account, "direct_imap", imap)
 
 
 @deltachat.global_hookimpl

python/src/deltachat/events.py

@@ -1,7 +1,6 @@
 import threading
 import time
 import re
-import os
 from queue import Queue, Empty
 
 import deltachat
@@ -49,15 +48,6 @@ class FFIEventLogger:
         if self.logid:
             locname += "-" + self.logid
         s = "{:2.2f} [{}] {}".format(elapsed, locname, message)
-
-        if os.name == "posix":
-            WARN = '\033[93m'
-            ERROR = '\033[91m'
-            ENDC = '\033[0m'
-            if message.startswith("DC_EVENT_WARNING"):
-                s = WARN + s + ENDC
-            if message.startswith("DC_EVENT_ERROR"):
-                s = ERROR + s + ENDC
         with self._loglock:
             print(s, flush=True)
 
@@ -103,14 +93,6 @@ class FFIEventTracker:
             if rex.search(ev.data2):
                 return ev
 
-    def get_info_regex_groups(self, regex, check_error=True):
-        rex = re.compile(regex)
-        while 1:
-            ev = self.get_matching("DC_EVENT_INFO", check_error=check_error)
-            m = rex.match(ev.data2)
-            if m is not None:
-                return m.groups()
-
     def ensure_event_not_queued(self, event_name_regex):
         __tracebackhide__ = True
         rex = re.compile("(?:{}).*".format(event_name_regex))
@@ -129,15 +111,6 @@ class FFIEventTracker:
                 print("** SECUREJOINT-INVITER PROGRESS {}".format(target), self.account)
                 break
 
-    def wait_all_initial_fetches(self):
-        """Has to be called after start_io() to wait for fetch_existing_msgs to run
-        so that new messages are not mistaken for old ones:
-        - ac1 and ac2 are created
-        - ac1 sends a message to ac2
-        - ac2 is still running FetchExsistingMsgs job and thinks it's an existing, old message
-        - therefore no DC_EVENT_INCOMING_MSG is sent"""
-        self.get_info_contains("Done fetching existing messages")
-
     def wait_next_incoming_message(self):
         """ wait for and return next incoming message. """
         ev = self.get_matching("DC_EVENT_INCOMING_MSG")

python/src/deltachat/message.py

@@ -175,27 +175,6 @@ class Message(object):
         if ts:
             return datetime.utcfromtimestamp(ts)
 
-    @property
-    def quoted_text(self):
-        """Text inside the quote
-
-        :returns: Quoted text"""
-        return from_dc_charpointer(lib.dc_msg_get_quoted_text(self._dc_msg))
-
-    @property
-    def quote(self):
-        """Quote getter
-
-        :returns: Quoted message, if found in the database"""
-        msg = lib.dc_msg_get_quoted_msg(self._dc_msg)
-        if msg:
-            return Message(self.account, ffi.gc(msg, lib.dc_msg_unref))
-
-    @quote.setter
-    def quote(self, quoted_message):
-        """Quote setter"""
-        lib.dc_msg_set_quote(self._dc_msg, quoted_message._dc_msg)
-
     def get_mime_headers(self):
         """ return mime-header object for an incoming message.
 

python/src/deltachat/testplugin.py

@@ -330,13 +330,6 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig, data):
             return accounts
 
         def clone_online_account(self, account, pre_generated_key=True):
-            """ Clones addr, mail_pw, mvbox_watch, mvbox_move, sentbox_watch and the
-            direct_imap object of an online account. This simulates the user setting
-            up a new device without importing a backup.
-
-            `pre_generated_key` only means that a key from python/tests/data/key is
-            used in order to speed things up.
-            """
             self.live_count += 1
             tmpdb = tmpdir.join("livedb%d" % self.live_count)
             ac = self.make_account(tmpdb.strpath, logid="ac{}".format(self.live_count))
@@ -349,29 +342,19 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig, data):
                 mvbox_move=account.get_config("mvbox_move"),
                 sentbox_watch=account.get_config("sentbox_watch"),
             ))
-            if hasattr(account, "direct_imap"):
-                # Attach the existing direct_imap. If we did not do this, a new one would be created and
-                # delete existing messages (see dc_account_extra_configure(configure))
-                ac.direct_imap = account.direct_imap
             ac._configtracker = ac.configure()
             return ac
 
         def wait_configure_and_start_io(self):
-            started_accounts = []
             for acc in self._accounts:
                 if hasattr(acc, "_configtracker"):
                     acc._configtracker.wait_finish()
-                    acc._evtracker.consume_events()
-                    acc.get_device_chat().mark_noticed()
                     del acc._configtracker
                 acc.set_config("bcc_self", "0")
                 if acc.is_configured() and not acc.is_started():
                     acc.start_io()
-                    started_accounts.append(acc)
                 print("{}: {} account was successfully setup".format(
                     acc.get_config("displayname"), acc.get_config("addr")))
-            for acc in started_accounts:
-                acc._evtracker.wait_all_initial_fetches()
 
         def run_bot_process(self, module, ffi=True):
             fn = module.__file__
@@ -510,9 +493,6 @@ def lp():
         def step(self, msg):
             print("-" * 5, "step " + msg, "-" * 5)
 
-        def indent(self, msg):
-            print("  " + msg)
-
     return Printer()
 
 

python/tests/test_account.py

@@ -129,20 +129,6 @@ class TestOfflineContact:
         assert not contact1.is_blocked()
         assert not contact1.is_verified()
 
-    def test_get_blocked(self, acfactory):
-        ac1 = acfactory.get_configured_offline_account()
-        contact1 = ac1.create_contact("some1@example.org", name="some1")
-        contact2 = ac1.create_contact("some2@example.org", name="some2")
-        ac1.create_contact("some3@example.org", name="some3")
-        assert ac1.get_blocked_contacts() == []
-        contact1.block()
-        assert ac1.get_blocked_contacts() == [contact1]
-        contact2.block()
-        blocked = ac1.get_blocked_contacts()
-        assert len(blocked) == 2 and contact1 in blocked and contact2 in blocked
-        contact2.unblock()
-        assert ac1.get_blocked_contacts() == [contact1]
-
     def test_create_self_contact(self, acfactory):
         ac1 = acfactory.get_configured_offline_account()
         contact1 = ac1.create_contact(ac1.get_config("addr"))
@@ -180,16 +166,6 @@ class TestOfflineContact:
         with pytest.raises(ValueError):
             ac1.create_chat(ac3)
 
-    def test_contact_rename(self, acfactory):
-        ac1 = acfactory.get_configured_offline_account()
-        contact = ac1.create_contact("some1@example.com", name="some1")
-        chat = ac1.create_chat(contact)
-        assert chat.get_name() == "some1"
-        ac1.create_contact("some1@example.com", name="renamed")
-        ev = ac1._evtracker.get_matching("DC_EVENT_CHAT_MODIFIED")
-        assert ev.data1 == chat.id
-        assert chat.get_name() == "renamed"
-
 
 class TestOfflineChat:
     @pytest.fixture
@@ -288,28 +264,6 @@ class TestOfflineChat:
         qr = chat.get_join_qr()
         assert ac2.check_qr(qr).is_ask_verifygroup
 
-    def test_removing_blocked_user_from_group(self, ac1, lp):
-        """
-        Test that blocked contact is not unblocked when removed from a group.
-        See https://github.com/deltachat/deltachat-core-rust/issues/2030
-        """
-        lp.sec("Create a group chat with a contact")
-        contact = ac1.create_contact("some1@example.org")
-        group = ac1.create_group_chat("title", contacts=[contact])
-        group.send_text("First group message")
-
-        lp.sec("ac1 blocks contact")
-        contact.block()
-        assert contact.is_blocked()
-
-        lp.sec("ac1 removes contact from their group")
-        group.remove_contact(contact)
-        assert contact.is_blocked()
-
-        lp.sec("ac1 adding blocked contact unblocks it")
-        group.add_contact(contact)
-        assert not contact.is_blocked()
-
     def test_get_set_profile_image_simple(self, ac1, data):
         chat = ac1.create_group_chat(name="title1")
         p = data.get_path("d.png")
@@ -512,21 +466,6 @@ class TestOfflineChat:
         assert not res.is_ask_verifygroup()
         assert res.contact_id == 10
 
-    def test_quote(self, chat1):
-        """Offline quoting test"""
-        msg = Message.new_empty(chat1.account, "text")
-        msg.set_text("Multi\nline\nmessage")
-        assert msg.quoted_text is None
-
-        # Prepare message to assign it a Message-Id.
-        # Messages without Message-Id cannot be quoted.
-        msg = chat1.prepare_message(msg)
-
-        reply_msg = Message.new_empty(chat1.account, "text")
-        reply_msg.set_text("reply")
-        reply_msg.quote = msg
-        assert reply_msg.quoted_text == "Multi\nline\nmessage"
-
     def test_group_chat_many_members_add_remove(self, ac1, lp):
         lp.sec("ac1: creating group chat with 10 other members")
         chat = ac1.create_group_chat(name="title1")
@@ -668,7 +607,7 @@ class TestOnlineAccount:
         except Exception:
             pass
 
-    def test_export_import_self_keys(self, acfactory, tmpdir, lp):
+    def test_export_import_self_keys(self, acfactory, tmpdir):
         ac1, ac2 = acfactory.get_two_online_accounts()
 
         dir = tmpdir.mkdir("exportdir")
@@ -676,17 +615,8 @@ class TestOnlineAccount:
         assert len(export_files) == 2
         for x in export_files:
             assert x.startswith(dir.strpath)
-        key_id, = ac1._evtracker.get_info_regex_groups(r".*xporting.*KeyId\((.*)\).*")
         ac1._evtracker.consume_events()
-
-        lp.sec("exported keys (private and public)")
-        for name in os.listdir(dir.strpath):
-            lp.indent(dir.strpath + os.sep + name)
-        lp.sec("importing into existing account")
         ac2.import_self_keys(dir.strpath)
-        key_id2, = ac2._evtracker.get_info_regex_groups(
-            r".*stored.*KeyId\((.*)\).*", check_error=False)
-        assert key_id2 == key_id
 
     def test_one_account_send_bcc_setting(self, acfactory, lp):
         ac1 = acfactory.get_online_configuring_account()
@@ -942,13 +872,7 @@ class TestOnlineAccount:
         lp.sec("mark messages as seen on ac2, wait for changes on ac1")
         ac2.direct_imap.idle_start()
         ac1.direct_imap.idle_start()
-
         ac2.mark_seen_messages([msg2, msg4])
-        ev = ac2._evtracker.get_matching("DC_EVENT_MSGS_NOTICED")
-        assert msg2.chat.id == msg4.chat.id
-        assert ev.data1 == msg2.chat.id
-        assert ev.data2 == 0
-
         ac2.direct_imap.idle_check(terminate=True)
         lp.step("1")
         for i in range(2):
@@ -969,30 +893,6 @@ class TestOnlineAccount:
         except queue.Empty:
             pass  # mark_seen_messages() has generated events before it returns
 
-    def test_reply_privately(self, acfactory):
-        ac1, ac2 = acfactory.get_two_online_accounts()
-
-        group1 = ac1.create_group_chat("group")
-        group1.add_contact(ac2)
-        group1.send_text("hello")
-
-        msg2 = ac2._evtracker.wait_next_messages_changed()
-        group2 = msg2.create_chat()
-        assert group2.get_name() == group1.get_name()
-
-        msg_reply = Message.new_empty(ac2, "text")
-        msg_reply.set_text("message reply")
-        msg_reply.quote = msg2
-
-        private_chat1 = ac1.create_chat(ac2)
-        private_chat2 = ac2.create_chat(ac1)
-        private_chat2.send_msg(msg_reply)
-
-        msg_reply1 = ac1._evtracker.wait_next_incoming_message()
-        assert msg_reply1.quoted_text == "hello"
-        assert not msg_reply1.chat.is_group()
-        assert msg_reply1.chat.id == private_chat1.id
-
     def test_mdn_asymetric(self, acfactory, lp):
         ac1, ac2 = acfactory.get_two_online_accounts(move=True)
 
@@ -1101,68 +1001,7 @@ class TestOnlineAccount:
         assert msg_in.text == text2
         assert ac1.get_config("addr") in [x.addr for x in msg_in.chat.get_contacts()]
 
-    def test_no_draft_if_cant_send(self, acfactory):
-        """Tests that no quote can be set if the user can't send to this chat"""
-        ac1 = acfactory.get_one_online_account()
-        device_chat = ac1.get_device_chat()
-        msg = Message.new_empty(ac1, "text")
-        device_chat.set_draft(msg)
-
-        assert not device_chat.can_send()
-        assert device_chat.get_draft() is None
-
-    def test_prefer_encrypt(self, acfactory, lp):
-        """Test quorum rule for encryption preference in 1:1 and group chat."""
-        ac1, ac2, ac3 = acfactory.get_many_online_accounts(3)
-        ac1.set_config("e2ee_enabled", "0")
-        ac2.set_config("e2ee_enabled", "1")
-        ac3.set_config("e2ee_enabled", "0")
-
-        # Make sure we do not send a copy to ourselves. This is to
-        # test that we count own preference even when we are not in
-        # the recipient list.
-        ac1.set_config("bcc_self", "0")
-        ac2.set_config("bcc_self", "0")
-        ac3.set_config("bcc_self", "0")
-
-        acfactory.introduce_each_other([ac1, ac2, ac3])
-
-        lp.sec("ac1: sending message to ac2")
-        chat1 = ac1.create_chat(ac2)
-        msg1 = chat1.send_text("message1")
-        assert not msg1.is_encrypted()
-        ac2._evtracker.wait_next_incoming_message()
-
-        lp.sec("ac2: sending message to ac1")
-        chat2 = ac2.create_chat(ac1)
-        msg2 = chat2.send_text("message2")
-        assert not msg2.is_encrypted()
-        ac1._evtracker.wait_next_incoming_message()
-
-        lp.sec("ac1: sending message to group chat with ac2 and ac3")
-        group = ac1.create_group_chat("hello")
-        group.add_contact(ac2)
-        group.add_contact(ac3)
-        msg3 = group.send_text("message3")
-        assert not msg3.is_encrypted()
-        ac2._evtracker.wait_next_incoming_message()
-        ac3._evtracker.wait_next_incoming_message()
-
-        lp.sec("ac3: start preferring encryption and inform ac1")
-        ac3.set_config("e2ee_enabled", "1")
-        chat3 = ac3.create_chat(ac1)
-        msg4 = chat3.send_text("message4")
-        # ac1 still does not prefer encryption
-        assert not msg4.is_encrypted()
-        ac1._evtracker.wait_next_incoming_message()
-
-        lp.sec("ac1: sending another message to group chat with ac2 and ac3")
-        msg5 = group.send_text("message5")
-        # Majority prefers encryption now
-        assert msg5.is_encrypted()
-
-    def test_quote_encrypted(self, acfactory, lp):
-        """Test that replies to encrypted messages with quotes are encrypted."""
+    def test_reply_encrypted(self, acfactory, lp):
         ac1, ac2 = acfactory.get_two_online_accounts()
 
         lp.sec("ac1: create chat with ac2")
@@ -1190,59 +1029,26 @@ class TestOnlineAccount:
         print("ac2: e2ee_enabled={}".format(ac2.get_config("e2ee_enabled")))
         ac1.set_config("e2ee_enabled", "0")
 
-        for quoted_msg in msg1, msg3:
-            # Save the draft with a quote.
-            # It should be encrypted if quoted message is encrypted.
-            msg_draft = Message.new_empty(ac1, "text")
-            msg_draft.set_text("message reply")
-            msg_draft.quote = quoted_msg
-            chat.set_draft(msg_draft)
+        # Set unprepared and unencrypted draft to test that it is not
+        # taken into account when determining whether last message is
+        # encrypted.
+        msg_draft = Message.new_empty(ac1, "text")
+        msg_draft.set_text("message2 -- should be encrypted")
+        chat.set_draft(msg_draft)
 
-            # Get the draft, prepare and send it.
-            msg_draft = chat.get_draft()
-            msg_out = chat.prepare_message(msg_draft)
-            chat.send_prepared(msg_out)
+        # Get the draft, prepare and send it.
+        msg_draft = chat.get_draft()
+        msg_out = chat.prepare_message(msg_draft)
+        chat.send_prepared(msg_out)
 
-            chat.set_draft(None)
-            assert chat.get_draft() is None
+        chat.set_draft(None)
+        assert chat.get_draft() is None
 
-            msg_in = ac2._evtracker.wait_next_incoming_message()
-            assert msg_in.text == "message reply"
-            assert msg_in.quoted_text == quoted_msg.text
-            assert msg_in.is_encrypted() == quoted_msg.is_encrypted()
-
-    def test_quote_attachment(self, tmpdir, acfactory, lp):
-        """Test that replies with an attachment and a quote are received correctly."""
-        ac1, ac2 = acfactory.get_two_online_accounts()
-
-        lp.sec("ac1 creates chat with ac2")
-        chat1 = ac1.create_chat(ac2)
-
-        lp.sec("ac1 sends text message to ac2")
-        chat1.send_text("hi")
-
-        lp.sec("ac2 receives contact request from ac1")
-        received_message = ac2._evtracker.wait_next_messages_changed()
-        assert received_message.text == "hi"
-
-        basename = "attachment.txt"
-        p = os.path.join(tmpdir.strpath, basename)
-        with open(p, "w") as f:
-            f.write("data to send")
-
-        lp.sec("ac2 sends a reply to ac1")
-        chat2 = received_message.create_chat()
-        reply = Message.new_empty(ac2, "file")
-        reply.set_text("message reply")
-        reply.set_file(p)
-        reply.quote = received_message
-        chat2.send_msg(reply)
-
-        lp.sec("ac1 receives a reply from ac2")
-        received_reply = ac1._evtracker.wait_next_incoming_message()
-        assert received_reply.text == "message reply"
-        assert received_reply.quoted_text == received_message.text
-        assert open(received_reply.filename).read() == "data to send"
+        lp.sec("wait for ac2 to receive message")
+        ev = ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG")
+        msg_in = ac2.get_message_by_id(ev.data2)
+        assert msg_in.text == "message2 -- should be encrypted"
+        assert msg_in.is_encrypted()
 
     def test_saved_mime_on_received_message(self, acfactory, lp):
         ac1, ac2 = acfactory.get_two_online_accounts()
@@ -1455,7 +1261,7 @@ class TestOnlineAccount:
         ac1, ac2 = acfactory.get_two_online_accounts()
         lp.sec("ac1: create verified-group QR, ac2 scans and joins")
         chat1 = ac1.create_group_chat("hello", verified=True)
-        assert chat1.is_protected()
+        assert chat1.is_verified()
         qr = chat1.get_join_qr()
         lp.sec("ac2: start QR-code based join-group protocol")
         chat2 = ac2.qr_join_chat(qr)
@@ -1474,7 +1280,7 @@ class TestOnlineAccount:
         lp.sec("ac2: read message and check it's verified chat")
         msg = ac2._evtracker.wait_next_incoming_message()
         assert msg.text == "hello"
-        assert msg.chat.is_protected()
+        assert msg.chat.is_verified()
         assert msg.is_encrypted()
 
         lp.sec("ac2: send message and let ac1 read it")
@@ -1609,10 +1415,8 @@ class TestOnlineAccount:
 
         lp.sec("ac1 blocks ac2")
         contact = ac1.create_contact(ac2)
-        contact.block()
+        contact.set_blocked()
         assert contact.is_blocked()
-        ev = ac1._evtracker.get_matching("DC_EVENT_CONTACTS_CHANGED")
-        assert ev.data1 == contact.id
 
         lp.sec("ac2 sends a message to ac1 that does not arrive because it is blocked")
         ac2.create_chat(ac1).send_text("This will not arrive!")
@@ -1756,7 +1560,6 @@ class TestOnlineAccount:
         chat41 = ac4.create_chat(ac1)
         chat42 = ac4.create_chat(ac2)
         ac4.start_io()
-        ac4._evtracker.wait_all_initial_fetches()
 
         lp.sec("ac1: creating group chat with 2 other members")
         chat = ac1.create_group_chat("title", contacts=[ac2, ac3])
@@ -1924,37 +1727,6 @@ class TestOnlineAccount:
 
         assert len(imap2.get_all_messages()) == 1
 
-    def test_configure_error_msgs(self, acfactory):
-        ac1, configdict = acfactory.get_online_config()
-        ac1.update_config(configdict)
-        ac1.set_config("mail_pw", "abc")  # Wrong mail pw
-        ac1.configure()
-        while True:
-            ev = ac1._evtracker.get_matching("DC_EVENT_CONFIGURE_PROGRESS")
-            if ev.data1 == 0:
-                break
-        # Password is wrong so it definitely has to say something about "password"
-        assert "password" in ev.data2
-
-        ac2, configdict = acfactory.get_online_config()
-        ac2.update_config(configdict)
-        ac2.set_config("addr", "abc@def.invalid")  # mail server can't be reached
-        ac2.configure()
-        while True:
-            ev = ac2._evtracker.get_matching("DC_EVENT_CONFIGURE_PROGRESS")
-            if ev.data1 == 0:
-                break
-        # Can't connect so it probably should say something about "internet"
-        # again, should not repeat itself
-        # If this fails then probably `e.msg.to_lowercase().contains("could not resolve")`
-        # in configure/mod.rs returned false because the error message was changed
-        # (i.e. did not contain "could not resolve" anymore)
-        assert (ev.data2.count("internet") + ev.data2.count("network")) == 1
-        # Should mention that it can't connect:
-        assert ev.data2.count("connect") == 1
-        # The users do not know what "configuration" is
-        assert "configuration" not in ev.data2.lower()
-
     def test_name_changes(self, acfactory):
         ac1, ac2 = acfactory.get_two_online_accounts()
         ac1.set_config("displayname", "Account 1")
@@ -1978,8 +1750,6 @@ class TestOnlineAccount:
         # Explicitly rename contact on ac2 to "Renamed"
         ac2.create_contact(contact, name="Renamed")
         assert contact.name == "Renamed"
-        ev = ac2._evtracker.get_matching("DC_EVENT_CONTACTS_CHANGED")
-        assert ev.data1 == contact.id
 
         # ac1 also renames itself into "Renamed"
         assert update_name() == "Renamed"
@@ -1997,83 +1767,6 @@ class TestOnlineAccount:
             # No renames should happen after explicit rename
             assert updated_name == "Renamed"
 
-    def test_group_quote(self, acfactory, lp):
-        """Test quoting in a group with a new member who have not seen the quoted message."""
-        ac1, ac2, ac3 = accounts = acfactory.get_many_online_accounts(3)
-        acfactory.introduce_each_other(accounts)
-        chat = ac1.create_group_chat(name="quote group")
-        chat.add_contact(ac2)
-
-        lp.sec("ac1: sending message")
-        out_msg = chat.send_text("hello")
-
-        lp.sec("ac2: receiving message")
-        msg = ac2._evtracker.wait_next_incoming_message()
-        assert msg.text == "hello"
-
-        chat.add_contact(ac3)
-        ac2._evtracker.wait_next_incoming_message()
-        ac3._evtracker.wait_next_incoming_message()
-
-        lp.sec("ac2: sending reply with a quote")
-        reply_msg = Message.new_empty(msg.chat.account, "text")
-        reply_msg.set_text("reply")
-        reply_msg.quote = msg
-        reply_msg = msg.chat.prepare_message(reply_msg)
-        assert reply_msg.quoted_text == "hello"
-        msg.chat.send_prepared(reply_msg)
-
-        lp.sec("ac3: receiving reply")
-        received_reply = ac3._evtracker.wait_next_incoming_message()
-        assert received_reply.text == "reply"
-        assert received_reply.quoted_text == "hello"
-        # ac3 was not in the group and has not received quoted message
-        assert received_reply.quote is None
-
-        lp.sec("ac1: receiving reply")
-        received_reply = ac1._evtracker.wait_next_incoming_message()
-        assert received_reply.text == "reply"
-        assert received_reply.quoted_text == "hello"
-        assert received_reply.quote.id == out_msg.id
-
-    @pytest.mark.parametrize("mvbox_move", [False, True])
-    def test_add_all_recipients_as_contacts(self, acfactory, lp, mvbox_move):
-        """Delta Chat reads the recipients from old emails sent by the user and adds them as contacts.
-        This way, we can already offer them some email addresses they can write to.
-
-        Also test that existing emails are fetched during onboarding.
-
-        Lastly, tests that bcc_self messages moved to the mvbox are marked as read."""
-        ac1 = acfactory.get_online_configuring_account(mvbox=mvbox_move, move=mvbox_move)
-        ac2 = acfactory.get_online_configuring_account()
-
-        acfactory.wait_configure_and_start_io()
-
-        chat = acfactory.get_accepted_chat(ac1, ac2)
-
-        lp.sec("send out message with bcc to ourselves")
-        if mvbox_move:
-            ac1.direct_imap.select_config_folder("mvbox")
-        ac1.direct_imap.idle_start()
-        ac1.set_config("bcc_self", "1")
-        chat.send_text("message text")
-
-        # now wait until the bcc_self message arrives
-        # Also test that bcc_self messages moved to the mvbox are marked as read.
-        assert ac1.direct_imap.idle_wait_for_seen()
-
-        ac1_clone = acfactory.clone_online_account(ac1)
-        ac1_clone.set_config("fetch_existing_msgs", "1")
-        ac1_clone._configtracker.wait_finish()
-        ac1_clone.start_io()
-
-        ac1_clone._evtracker.get_matching("DC_EVENT_CONTACTS_CHANGED")
-        ac2_addr = ac2.get_config("addr")
-        assert any(c.addr == ac2_addr for c in ac1_clone.get_contacts())
-
-        msg = ac1_clone._evtracker.wait_next_messages_changed()
-        assert msg.text == "message text"
-
 
 class TestGroupStressTests:
     def test_group_many_members_add_leave_remove(self, acfactory, lp):

set_core_version.py

@@ -63,14 +63,13 @@ def main():
     ffi_toml = read_toml_version("deltachat-ffi/Cargo.toml")
     assert core_toml == ffi_toml, (core_toml, ffi_toml)
 
-    if "alpha" not in newversion:
-        for line in open("CHANGELOG.md"):
-            ## 1.25.0
-            if line.startswith("## "):
-                if line[2:].strip().startswith(newversion):
-                    break
-        else:
-            raise SystemExit("CHANGELOG.md contains no entry for version: {}".format(newversion))
+    for line in open("CHANGELOG.md"):
+        ## 1.25.0
+        if line.startswith("## "):
+            if line[2:].strip().startswith(newversion):
+                break
+    else:
+        raise SystemExit("CHANGELOG.md contains no entry for version: {}".format(newversion))
 
     replace_toml_version("Cargo.toml", newversion)
     replace_toml_version("deltachat-ffi/Cargo.toml", newversion)

spec.md

@@ -32,7 +32,7 @@ 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://tools.ietf.org/id/draft-autocrypt-lamps-protected-headers-02.html) standard.
+by the [Protected Headers](https://www.ietf.org/id/draft-autocrypt-lamps-protected-headers-02.html) standard.
 
 
 # Outgoing messages

src/accounts.rs

@@ -1,8 +1,10 @@
 use std::collections::BTreeMap;
+use std::pin::Pin;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::task::{Context as TaskContext, Poll};
 
 use async_std::fs;
 use async_std::path::PathBuf;
-use async_std::prelude::*;
 use async_std::sync::{Arc, RwLock};
 use uuid::Uuid;
 
@@ -188,7 +190,7 @@ impl Accounts {
         let id = self.add_account().await?;
         let ctx = self.get_account(id).await.expect("just added");
 
-        match crate::imex::imex(&ctx, crate::imex::ImexMode::ImportBackup, &file).await {
+        match crate::imex::imex(&ctx, crate::imex::ImexMode::ImportBackup, Some(file)).await {
             Ok(_) => Ok(id),
             Err(err) => {
                 // remove temp account
@@ -223,42 +225,61 @@ impl Accounts {
 
     /// Unified event emitter.
     pub async fn get_event_emitter(&self) -> EventEmitter {
-        let emitters: Vec<_> = self
+        let emitters = self
             .accounts
             .read()
             .await
             .iter()
-            .map(|(_id, a)| a.get_event_emitter())
+            .map(|(id, a)| EmitterWrapper {
+                id: *id,
+                emitter: a.get_event_emitter(),
+                done: AtomicBool::new(false),
+            })
             .collect();
 
-        EventEmitter(futures::stream::select_all(emitters))
+        EventEmitter(emitters)
+    }
+}
+
+impl EventEmitter {
+    /// Blocking recv of an event. Return `None` if the `Sender` has been droped.
+    pub fn recv_sync(&self) -> Option<Event> {
+        async_std::task::block_on(self.recv())
+    }
+
+    /// Async recv of an event. Return `None` if the `Sender` has been droped.
+    pub async fn recv(&self) -> Option<Event> {
+        futures::future::poll_fn(|cx| Pin::new(self).recv_poll(cx)).await
+    }
+
+    fn recv_poll(self: Pin<&Self>, _cx: &mut TaskContext<'_>) -> Poll<Option<Event>> {
+        for e in &*self.0 {
+            if e.done.load(Ordering::Acquire) {
+                // skip emitters that are already done
+                continue;
+            }
+
+            match e.emitter.try_recv() {
+                Ok(event) => return Poll::Ready(Some(event)),
+                Err(async_std::sync::TryRecvError::Disconnected) => {
+                    e.done.store(true, Ordering::Release);
+                }
+                Err(async_std::sync::TryRecvError::Empty) => {}
+            }
+        }
+
+        Poll::Pending
     }
 }
 
 #[derive(Debug)]
-pub struct EventEmitter(futures::stream::SelectAll<crate::events::EventEmitter>);
+pub struct EventEmitter(Vec<EmitterWrapper>);
 
-impl EventEmitter {
-    /// Blocking recv of an event. Return `None` if all `Sender`s have been droped.
-    pub fn recv_sync(&mut self) -> Option<Event> {
-        async_std::task::block_on(self.recv())
-    }
-
-    /// Async recv of an event. Return `None` if all `Sender`s have been droped.
-    pub async fn recv(&mut self) -> Option<Event> {
-        self.0.next().await
-    }
-}
-
-impl async_std::stream::Stream for EventEmitter {
-    type Item = Event;
-
-    fn poll_next(
-        mut self: std::pin::Pin<&mut Self>,
-        cx: &mut std::task::Context<'_>,
-    ) -> std::task::Poll<Option<Self::Item>> {
-        std::pin::Pin::new(&mut self.0).poll_next(cx)
-    }
+#[derive(Debug)]
+struct EmitterWrapper {
+    id: u32,
+    emitter: crate::events::EventEmitter,
+    done: AtomicBool,
 }
 
 pub const CONFIG_NAME: &str = "accounts.toml";
@@ -347,6 +368,7 @@ impl Config {
 
             inner.accounts.push(AccountConfig {
                 id,
+                name: String::new(),
                 dir: target_dir.into(),
                 uuid,
             });
@@ -413,6 +435,8 @@ impl Config {
 pub struct AccountConfig {
     /// Unique id.
     pub id: u32,
+    /// Display name
+    pub name: String,
     /// Root directory for all data for this account.
     pub dir: std::path::PathBuf,
     pub uuid: Uuid,

src/blob.rs

@@ -63,12 +63,6 @@ impl<'a> BlobObject<'a> {
                 blobname: name.clone(),
                 cause: err.into(),
             })?;
-
-        // workaround a bug in async-std
-        // (the executor does not handle blocking operation in Drop correctly,
-        // see https://github.com/async-rs/async-std/issues/900 )
-        let _ = file.flush().await;
-
         let blob = BlobObject {
             blobdir,
             name: format!("$BLOBDIR/{}", name),
@@ -157,10 +151,6 @@ impl<'a> BlobObject<'a> {
                 cause: err,
             });
         }
-
-        // workaround, see create() for details
-        let _ = dst_file.flush().await;
-
         let blob = BlobObject {
             blobdir: context.get_blobdir(),
             name: format!("$BLOBDIR/{}", name),

src/chatlist.rs

@@ -362,7 +362,9 @@ impl Chatlist {
         let mut lastcontact = None;
 
         let lastmsg = if let Ok(lastmsg) = Message::load_from_db(context, lastmsg_id).await {
-            if lastmsg.from_id != DC_CONTACT_ID_SELF && chat.typ == Chattype::Group {
+            if lastmsg.from_id != DC_CONTACT_ID_SELF
+                && (chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup)
+            {
                 lastcontact = Contact::load_from_db(context, lastmsg.from_id).await.ok();
             }
 
@@ -438,13 +440,13 @@ mod tests {
     #[async_std::test]
     async fn test_try_load() {
         let t = TestContext::new().await;
-        let chat_id1 = create_group_chat(&t.ctx, ProtectionStatus::Unprotected, "a chat")
+        let chat_id1 = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "a chat")
             .await
             .unwrap();
-        let chat_id2 = create_group_chat(&t.ctx, ProtectionStatus::Unprotected, "b chat")
+        let chat_id2 = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "b chat")
             .await
             .unwrap();
-        let chat_id3 = create_group_chat(&t.ctx, ProtectionStatus::Unprotected, "c chat")
+        let chat_id3 = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "c chat")
             .await
             .unwrap();
 
@@ -487,7 +489,7 @@ mod tests {
     async fn test_sort_self_talk_up_on_forward() {
         let t = TestContext::new().await;
         t.ctx.update_device_chats().await.unwrap();
-        create_group_chat(&t.ctx, ProtectionStatus::Unprotected, "a chat")
+        create_group_chat(&t.ctx, VerifiedStatus::Unverified, "a chat")
             .await
             .unwrap();
 
@@ -544,7 +546,7 @@ mod tests {
     #[async_std::test]
     async fn test_get_summary_unwrap() {
         let t = TestContext::new().await;
-        let chat_id1 = create_group_chat(&t.ctx, ProtectionStatus::Unprotected, "a chat")
+        let chat_id1 = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "a chat")
             .await
             .unwrap();
 

src/config.rs

@@ -69,13 +69,6 @@ pub enum Config {
     #[strum(props(default = "0"))] // also change MediaQuality.default() on changes
     MediaQuality,
 
-    /// If set to "1", on the first time `start_io()` is called after configuring,
-    /// the newest existing messages are fetched.
-    /// Existing recipients are added to the contact database regardless of this setting.
-    #[strum(props(default = "0"))]
-    // disabled for now, we'll set this back to "1" at some point
-    FetchExistingMsgs,
-
     #[strum(props(default = "0"))]
     KeyGenType,
 
@@ -128,11 +121,9 @@ pub enum Config {
     #[strum(serialize = "sys.config_keys")]
     SysConfigKeys,
 
-    Bot,
-
+    #[strum(props(default = "0"))]
     /// Whether we send a warning if the password is wrong (set to false when we send a warning
     /// because we do not want to send a second warning)
-    #[strum(props(default = "0"))]
     NotifyAboutWrongPw,
 
     /// address to webrtc instance to use for videochats
@@ -253,16 +244,6 @@ impl Context {
                 job::schedule_resync(self).await;
                 ret
             }
-            Config::InboxWatch => {
-                if self.get_config(Config::InboxWatch).await.as_deref() != value {
-                    // If Inbox-watch is disabled and enabled again, do not fetch emails from in between.
-                    // this avoids unexpected mass-downloads and -deletions (if delete_server_after is set)
-                    if let Some(inbox) = self.get_config(Config::ConfiguredInboxFolder).await {
-                        crate::imap::set_config_last_seen_uid(self, inbox, 0, 0).await;
-                    }
-                }
-                self.sql.set_raw_config(self, key, value).await
-            }
             _ => self.sql.set_raw_config(self, key, value).await,
         }
     }

src/configure/mod.rs

@@ -8,11 +8,11 @@ mod server_params;
 use anyhow::{bail, ensure, Context as _, Result};
 use async_std::prelude::*;
 use async_std::task;
-use itertools::Itertools;
-use job::Action;
 use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
 
 use crate::config::Config;
+use crate::constants::*;
+use crate::context::Context;
 use crate::dc_tools::*;
 use crate::imap::Imap;
 use crate::login_param::{LoginParam, ServerLoginParam};
@@ -22,8 +22,6 @@ use crate::provider::{Protocol, Socket, UsernamePattern};
 use crate::smtp::Smtp;
 use crate::stock::StockMessage;
 use crate::{chat, e2ee, provider};
-use crate::{constants::*, job};
-use crate::{context::Context, param::Params};
 
 use auto_mozilla::moz_autoconfigure;
 use auto_outlook::outlk_autodiscover;
@@ -126,8 +124,7 @@ impl Context {
                     Some(
                         self.stock_string_repl_str(
                             StockMessage::ConfigurationFailed,
-                            // We are using Anyhow's .context() and to show the inner error, too, we need the {:#}:
-                            format!("{:#}", err),
+                            err.to_string(),
                         )
                         .await
                     )
@@ -163,9 +160,6 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
         DC_LP_AUTH_NORMAL as i32
     };
 
-    let ctx2 = ctx.clone();
-    let update_device_chats_handle = task::spawn(async move { ctx2.update_device_chats().await });
-
     // Step 1: Load the parameters and check email-address and password
 
     if oauth2 {
@@ -217,32 +211,28 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
 
     progress!(ctx, 500);
 
-    let mut servers = param_autoconfig.unwrap_or_default();
-    if !servers
-        .iter()
-        .any(|server| server.protocol == Protocol::IMAP)
-    {
-        servers.push(ServerParams {
-            protocol: Protocol::IMAP,
-            hostname: param.imap.server.clone(),
-            port: param.imap.port,
-            socket: param.imap.security,
-            username: param.imap.user.clone(),
-        })
-    }
-    if !servers
-        .iter()
-        .any(|server| server.protocol == Protocol::SMTP)
-    {
-        servers.push(ServerParams {
-            protocol: Protocol::SMTP,
-            hostname: param.smtp.server.clone(),
-            port: param.smtp.port,
-            socket: param.smtp.security,
-            username: param.smtp.user.clone(),
-        })
-    }
-    let servers = expand_param_vector(servers, &param.addr, &param_domain);
+    let servers = expand_param_vector(
+        param_autoconfig.unwrap_or_else(|| {
+            vec![
+                ServerParams {
+                    protocol: Protocol::IMAP,
+                    hostname: param.imap.server.clone(),
+                    port: param.imap.port,
+                    socket: param.imap.security,
+                    username: param.imap.user.clone(),
+                },
+                ServerParams {
+                    protocol: Protocol::SMTP,
+                    hostname: param.smtp.server.clone(),
+                    port: param.smtp.port,
+                    socket: param.smtp.security,
+                    username: param.smtp.user.clone(),
+                },
+            ]
+        }),
+        &param.addr,
+        &param_domain,
+    );
 
     progress!(ctx, 550);
 
@@ -260,28 +250,22 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
 
     let smtp_config_task = task::spawn(async move {
         let mut smtp_configured = false;
-        let mut errors = Vec::new();
         for smtp_server in smtp_servers {
             smtp_param.user = smtp_server.username.clone();
             smtp_param.server = smtp_server.hostname.clone();
             smtp_param.port = smtp_server.port;
             smtp_param.security = smtp_server.socket;
 
-            match try_smtp_one_param(&context_smtp, &smtp_param, &smtp_addr, oauth2, &mut smtp)
-                .await
-            {
-                Ok(_) => {
-                    smtp_configured = true;
-                    break;
-                }
-                Err(e) => errors.push(e),
+            if try_smtp_one_param(&context_smtp, &smtp_param, &smtp_addr, oauth2, &mut smtp).await {
+                smtp_configured = true;
+                break;
             }
         }
 
         if smtp_configured {
-            Ok(smtp_param)
+            Some(smtp_param)
         } else {
-            Err(errors)
+            None
         }
     });
 
@@ -297,19 +281,15 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
         .filter(|params| params.protocol == Protocol::IMAP)
         .collect();
     let imap_servers_count = imap_servers.len();
-    let mut errors = Vec::new();
     for (imap_server_index, imap_server) in imap_servers.into_iter().enumerate() {
         param.imap.user = imap_server.username.clone();
         param.imap.server = imap_server.hostname.clone();
         param.imap.port = imap_server.port;
         param.imap.security = imap_server.socket;
 
-        match try_imap_one_param(ctx, &param.imap, &param.addr, oauth2, &mut imap).await {
-            Ok(_) => {
-                imap_configured = true;
-                break;
-            }
-            Err(e) => errors.push(e),
+        if try_imap_one_param(ctx, &param.imap, &param.addr, oauth2, &mut imap).await {
+            imap_configured = true;
+            break;
         }
         progress!(
             ctx,
@@ -317,19 +297,16 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
         );
     }
     if !imap_configured {
-        bail!(nicer_configuration_error(ctx, errors).await);
+        bail!("IMAP autoconfig did not succeed");
     }
 
     progress!(ctx, 850);
 
     // Wait for SMTP configuration
-    match smtp_config_task.await {
-        Ok(smtp_param) => {
-            param.smtp = smtp_param;
-        }
-        Err(errors) => {
-            bail!(nicer_configuration_error(ctx, errors).await);
-        }
+    if let Some(smtp_param) = smtp_config_task.await {
+        param.smtp = smtp_param;
+    } else {
+        bail!("SMTP autoconfig did not succeed");
     }
 
     progress!(ctx, 900);
@@ -357,14 +334,7 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
     e2ee::ensure_secret_key_exists(ctx).await?;
     info!(ctx, "key generation completed");
 
-    job::add(
-        ctx,
-        job::Job::new(Action::FetchExistingMsgs, 0, Params::new(), 0),
-    )
-    .await;
-
     progress!(ctx, 940);
-    update_device_chats_handle.await?;
 
     Ok(())
 }
@@ -508,7 +478,7 @@ async fn try_imap_one_param(
     addr: &str,
     oauth2: bool,
     imap: &mut Imap,
-) -> Result<(), ConfigurationError> {
+) -> bool {
     let inf = format!(
         "imap: {}@{}:{} security={} certificate_checks={} oauth2={}",
         param.user, param.server, param.port, param.security, param.certificate_checks, oauth2
@@ -517,13 +487,10 @@ async fn try_imap_one_param(
 
     if let Err(err) = imap.connect(context, param, addr, oauth2).await {
         info!(context, "failure: {}", err);
-        Err(ConfigurationError {
-            config: inf,
-            msg: err.to_string(),
-        })
+        false
     } else {
         info!(context, "success: {}", inf);
-        Ok(())
+        true
     }
 }
 
@@ -533,7 +500,7 @@ async fn try_smtp_one_param(
     addr: &str,
     oauth2: bool,
     smtp: &mut Smtp,
-) -> Result<(), ConfigurationError> {
+) -> bool {
     let inf = format!(
         "smtp: {}@{}:{} security={} certificate_checks={} oauth2={}",
         param.user, param.server, param.port, param.security, param.certificate_checks, oauth2
@@ -542,63 +509,27 @@ async fn try_smtp_one_param(
 
     if let Err(err) = smtp.connect(context, param, addr, oauth2).await {
         info!(context, "failure: {}", err);
-        Err(ConfigurationError {
-            config: inf,
-            msg: err.to_string(),
-        })
+        false
     } else {
         info!(context, "success: {}", inf);
         smtp.disconnect().await;
-        Ok(())
+        true
     }
 }
 
-#[derive(Debug, thiserror::Error)]
-#[error("Trying {config}…\nError: {msg}")]
-pub struct ConfigurationError {
-    config: String,
-    msg: String,
-}
-
-async fn nicer_configuration_error(context: &Context, errors: Vec<ConfigurationError>) -> String {
-    let first_err = if let Some(f) = errors.first() {
-        f
-    } else {
-        // This means configuration failed but no errors have been captured. This should never
-        // happen, but if it does, the user will see classic "Error: no error".
-        return "no error".to_string();
-    };
-
-    if errors
-        .iter()
-        .all(|e| e.msg.to_lowercase().contains("could not resolve"))
-    {
-        return context
-            .stock_str(StockMessage::ErrorNoNetwork)
-            .await
-            .to_string();
-    }
-
-    if errors.iter().all(|e| e.msg == first_err.msg) {
-        return first_err.msg.to_string();
-    }
-
-    errors.iter().map(|e| e.to_string()).join("\n\n")
-}
-
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
     #[error("Invalid email address: {0:?}")]
     InvalidEmailAddress(String),
 
-    #[error("XML error at position {position}: {error}")]
+    #[error("XML error at position {position}")]
     InvalidXml {
         position: usize,
         #[source]
         error: quick_xml::Error,
     },
 
-    #[error("Failed to get URL: {0}")]
+    #[error("Failed to get URL")]
     ReadUrlError(#[from] self::read_url::Error),
 
     #[error("Number of redirection is exceeded")]

src/configure/read_url.rs

@@ -12,7 +12,7 @@ pub async fn read_url(context: &Context, url: &str) -> Result<String, Error> {
     match surf::get(url).recv_string().await {
         Ok(res) => Ok(res),
         Err(err) => {
-            info!(context, "Can\'t read URL {}: {}", url, err);
+            info!(context, "Can\'t read URL {}", url);
 
             Err(Error::GetError(err))
         }

src/constants.rs

@@ -1,9 +1,11 @@
 //! # Constants
 use deltachat_derive::*;
-use once_cell::sync::Lazy;
+use lazy_static::lazy_static;
 use serde::{Deserialize, Serialize};
 
-pub static DC_VERSION_STR: Lazy<String> = Lazy::new(|| env!("CARGO_PKG_VERSION").to_string());
+lazy_static! {
+    pub static ref DC_VERSION_STR: String = env!("CARGO_PKG_VERSION").to_string();
+}
 
 #[derive(
     Debug,
@@ -106,16 +108,14 @@ pub const DC_GCL_ADD_SELF: usize = 0x02;
 // unchanged user avatars are resent to the recipients every some days
 pub const DC_RESEND_USER_AVATAR_DAYS: i64 = 14;
 
-// warn about an outdated app after a given number of days.
-// as we use the "provider-db generation date" as reference (that might not be updated very often)
-// and as not all system get speedy updates,
-// do not use too small value that will annoy users checking for nonexistant updates.
-pub const DC_OUTDATED_WARNING_DAYS: i64 = 365;
-
 /// virtual chat showing all messages belonging to chats flagged with chats.blocked=2
 pub const DC_CHAT_ID_DEADDROP: u32 = 1;
 /// messages that should be deleted get this chat_id; the messages are deleted from the working thread later then. This is also needed as rfc724_mid should be preset as long as the message is not deleted on the server (otherwise it is downloaded again)
 pub const DC_CHAT_ID_TRASH: u32 = 3;
+/// a message is just in creation but not yet assigned to a chat (eg. we may need the message ID to set up blobs; this avoids unready message to be sent and shown)
+pub const DC_CHAT_ID_MSGS_IN_CREATION: u32 = 4;
+/// virtual chat showing all messages flagged with msgs.starred=2
+pub const DC_CHAT_ID_STARRED: u32 = 5;
 /// only an indicator in a chatlist
 pub const DC_CHAT_ID_ARCHIVED_LINK: u32 = 6;
 /// only an indicator in a chatlist
@@ -143,6 +143,7 @@ pub enum Chattype {
     Undefined = 0,
     Single = 100,
     Group = 120,
+    VerifiedGroup = 130,
 }
 
 impl Default for Chattype {
@@ -192,9 +193,6 @@ pub const DC_LP_AUTH_NORMAL: i32 = 0x4;
 /// if none of these flags are set, the default is chosen
 pub const DC_LP_AUTH_FLAGS: i32 = DC_LP_AUTH_OAUTH2 | DC_LP_AUTH_NORMAL;
 
-/// How many existing messages shall be fetched after configuration.
-pub const DC_FETCH_EXISTING_MSGS_COUNT: i64 = 100;
-
 // max. width/height of an avatar
 pub const AVATAR_SIZE: u32 = 192;
 
@@ -205,11 +203,6 @@ 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;
 
-// if more recipients are needed in SMTP's `RCPT TO:` header, recipient-list is splitted to chunks.
-// this does not affect MIME'e `To:` header.
-// can be overwritten by the setting `max_smtp_rcpt_to` in provider-db.
-pub const DEFAULT_MAX_SMTP_RCPT_TO: usize = 50;
-
 #[derive(
     Debug,
     Display,

src/contact.rs

@@ -3,7 +3,7 @@
 use async_std::path::PathBuf;
 use deltachat_derive::*;
 use itertools::Itertools;
-use once_cell::sync::Lazy;
+use lazy_static::lazy_static;
 use regex::Regex;
 
 use crate::aheader::EncryptPreference;
@@ -16,7 +16,7 @@ use crate::error::{bail, ensure, format_err, Result};
 use crate::events::EventType;
 use crate::key::{DcKey, SignedPublicKey};
 use crate::login_param::LoginParam;
-use crate::message::MessageState;
+use crate::message::{MessageState, MsgId};
 use crate::mimeparser::AvatarAction;
 use crate::param::*;
 use crate::peerstate::*;
@@ -247,12 +247,13 @@ impl Contact {
         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;
-        match sth_modified {
-            Modifier::None => {}
-            Modifier::Modified | Modifier::Created => {
-                context.emit_event(EventType::ContactsChanged(Some(contact_id)))
-            }
-        }
+        context.emit_event(EventType::ContactsChanged(
+            if sth_modified == Modifier::Created {
+                Some(contact_id)
+            } else {
+                None
+            },
+        ));
         if blocked {
             Contact::unblock(context, contact_id).await;
         }
@@ -260,9 +261,10 @@ impl Contact {
         Ok(contact_id)
     }
 
-    /// Mark messages from a contact as noticed.
-    /// The contact is expected to belong to the deaddrop,
-    /// therefore, DC_EVENT_MSGS_NOTICED(DC_CHAT_ID_DEADDROP) is emitted.
+    /// Mark all messages sent by the given contact
+    /// as *noticed*.  See also dc_marknoticed_chat() and dc_markseen_msgs()
+    ///
+    /// Calling this function usually results in the event `#DC_EVENT_MSGS_CHANGED`.
     pub async fn mark_noticed(context: &Context, id: u32) {
         if context
             .sql
@@ -273,7 +275,10 @@ impl Contact {
             .await
             .is_ok()
         {
-            context.emit_event(EventType::MsgsNoticed(ChatId::new(DC_CHAT_ID_DEADDROP)));
+            context.emit_event(EventType::MsgsChanged {
+                chat_id: ChatId::new(0),
+                msg_id: MsgId::new(0),
+            });
         }
     }
 
@@ -452,20 +457,10 @@ impl Contact {
                 if update_name {
                     // Update the contact name also if it is used as a group name.
                     // This is one of the few duplicated data, however, getting the chat list is easier this way.
-                    let chat_id = context.sql.query_get_value::<i32>(
-                        context,
-                        "SELECT id FROM chats WHERE type=? AND id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?)",
-                        paramsv![Chattype::Single, row_id]
-                    ).await;
-                    if let Some(chat_id) = chat_id {
-                        match context.sql.execute("UPDATE chats SET name=? WHERE id=? AND name!=?1", paramsv![new_name, chat_id]).await {
-                            Err(err) => warn!(context, "Can't update chat name: {}", err),
-                            Ok(count) => if count > 0 {
-                                // Chat name updated
-                                context.emit_event(EventType::ChatModified(ChatId::new(chat_id as u32)));
-                            }
-                        }
-                    }
+                    context.sql.execute(
+                    "UPDATE chats SET name=? WHERE type=? AND id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?);",
+                    paramsv![new_name, Chattype::Single, row_id]
+                ).await.ok();
                 }
                 sth_modified = Modifier::Modified;
             }
@@ -1053,7 +1048,9 @@ pub fn addr_normalize(addr: &str) -> &str {
 }
 
 fn sanitize_name_and_addr(name: impl AsRef<str>, addr: impl AsRef<str>) -> (String, String) {
-    static ADDR_WITH_NAME_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new("(.*)<(.*)>").unwrap());
+    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() {
@@ -1094,12 +1091,12 @@ async fn set_block_contact(context: &Context, contact_id: u32, new_blocking: boo
             // However, I'm not sure about this point; it may be confusing if the user wants to add other people;
             // this would result in recreating the same group...)
             if context.sql.execute(
-                "UPDATE chats SET blocked=? WHERE type=? AND id IN (SELECT chat_id FROM chats_contacts WHERE contact_id=?);",
-                paramsv![new_blocking, 100, contact_id as i32]).await.is_ok()
-            {
-                Contact::mark_noticed(context, contact_id).await;
-                context.emit_event(EventType::ContactsChanged(Some(contact_id)));
-            }
+                    "UPDATE chats SET blocked=? WHERE type=? AND id IN (SELECT chat_id FROM chats_contacts WHERE contact_id=?);",
+                    paramsv![new_blocking, 100, contact_id as i32],
+                ).await.is_ok() {
+                    Contact::mark_noticed(context, contact_id).await;
+                    context.emit_event(EventType::ContactsChanged(None));
+                }
         }
     }
 }

src/context.rs

@@ -136,7 +136,10 @@ impl Context {
         let ctx = Context {
             inner: Arc::new(inner),
         };
-        ctx.sql.open(&ctx, &ctx.dbfile, false).await?;
+        ensure!(
+            ctx.sql.open(&ctx, &ctx.dbfile, false).await,
+            "Failed opening sqlite database"
+        );
 
         Ok(ctx)
     }
@@ -163,6 +166,10 @@ 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;
     }
@@ -479,19 +486,14 @@ impl InnerContext {
     }
 
     async fn stop_io(&self) {
-        if self.is_io_running().await {
-            let token = {
-                let lock = &*self.scheduler.read().await;
-                lock.pre_stop().await
-            };
-            {
-                let lock = &mut *self.scheduler.write().await;
-                lock.stop(token).await;
-            }
-        }
-
-        if let Some(ephemeral_task) = self.ephemeral_task.write().await.take() {
-            ephemeral_task.cancel().await;
+        assert!(self.is_io_running().await, "context is already stopped");
+        let token = {
+            let lock = &*self.scheduler.read().await;
+            lock.pre_stop().await
+        };
+        {
+            let lock = &mut *self.scheduler.write().await;
+            lock.stop(token).await;
         }
     }
 }

src/dc_receive_imf.rs

@@ -4,7 +4,7 @@ use sha2::{Digest, Sha256};
 
 use mailparse::SingleInfo;
 
-use crate::chat::{self, Chat, ChatId, ProtectionStatus};
+use crate::chat::{self, Chat, ChatId};
 use crate::config::Config;
 use crate::constants::*;
 use crate::contact::*;
@@ -43,17 +43,6 @@ pub async fn dc_receive_imf(
     server_folder: impl AsRef<str>,
     server_uid: u32,
     seen: bool,
-) -> Result<()> {
-    dc_receive_imf_inner(context, imf_raw, server_folder, server_uid, seen, false).await
-}
-
-pub(crate) async fn dc_receive_imf_inner(
-    context: &Context,
-    imf_raw: &[u8],
-    server_folder: impl AsRef<str>,
-    server_uid: u32,
-    seen: bool,
-    fetching_existing_messages: bool,
 ) -> Result<()> {
     info!(
         context,
@@ -180,7 +169,6 @@ pub(crate) async fn dc_receive_imf_inner(
             &mut insert_msg_id,
             &mut created_db_entries,
             &mut create_event_to_send,
-            fetching_existing_messages,
         )
         .await
         {
@@ -347,7 +335,6 @@ async fn add_parts(
     insert_msg_id: &mut MsgId,
     created_db_entries: &mut Vec<(ChatId, MsgId)>,
     create_event_to_send: &mut Option<CreateEvent>,
-    fetching_existing_messages: bool,
 ) -> Result<()> {
     let mut state: MessageState;
     let mut chat_id_blocked = Blocked::Not;
@@ -387,7 +374,6 @@ async fn add_parts(
         // this message is a classic email not a chat-message nor a reply to one
         match show_emails {
             ShowEmails::Off => {
-                info!(context, "Classical email not shown (TRASH)");
                 *chat_id = ChatId::new(DC_CHAT_ID_TRASH);
                 allow_creation = false;
             }
@@ -403,7 +389,7 @@ async fn add_parts(
     let to_id: u32;
 
     if incoming {
-        state = if seen || fetching_existing_messages {
+        state = if seen {
             MessageState::InSeen
         } else {
             MessageState::InFresh
@@ -446,7 +432,10 @@ async fn add_parts(
         // it might also be blocked and displayed in the deaddrop as a result
         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 (TRASH)",);
+            info!(
+                context,
+                "Message belongs to an NDN and is not shown in a chat.",
+            );
         }
 
         if chat_id.is_unset() {
@@ -487,7 +476,7 @@ async fn add_parts(
             // check if the message belongs to a mailing list
             if mime_parser.is_mailinglist_message() {
                 *chat_id = ChatId::new(DC_CHAT_ID_TRASH);
-                info!(context, "Message belongs to a mailing list (TRASH)");
+                info!(context, "Message belongs to a mailing list and is ignored.",);
             }
         }
 
@@ -531,7 +520,6 @@ async fn add_parts(
         if chat_id.is_unset() {
             // maybe from_id is null or sth. else is suspicious, move message to trash
             *chat_id = ChatId::new(DC_CHAT_ID_TRASH);
-            info!(context, "No chat id for incoming msg (TRASH)")
         }
 
         // if the chat_id is blocked,
@@ -544,10 +532,6 @@ async fn add_parts(
             && show_emails != ShowEmails::All
         {
             state = MessageState::InNoticed;
-        } else if fetching_existing_messages && Blocked::Deaddrop == chat_id_blocked {
-            // The fetched existing message should be shown in the chatlist-contact-request because
-            // a new user won't find the contact request in the menu
-            state = MessageState::InFresh;
         }
     } else {
         // Outgoing
@@ -641,16 +625,9 @@ async fn add_parts(
         }
         if chat_id.is_unset() {
             *chat_id = ChatId::new(DC_CHAT_ID_TRASH);
-            info!(context, "No chat id for outgoing message (TRASH)")
         }
     }
 
-    if fetching_existing_messages && mime_parser.decrypting_failed {
-        *chat_id = ChatId::new(DC_CHAT_ID_TRASH);
-        // We are only gathering old messages on first start. We do not want to add loads of non-decryptable messages to the chats.
-        info!(context, "Existing non-decipherable message. (TRASH)");
-    }
-
     // Extract ephemeral timer from the message.
     let mut ephemeral_timer = if let Some(value) = mime_parser.get(HeaderDef::EphemeralTimer) {
         match value.parse::<EphemeralTimer>() {
@@ -714,43 +691,6 @@ async fn add_parts(
         ephemeral_timer = EphemeralTimer::Disabled;
     }
 
-    // if a chat is protected, check additional properties
-    if !chat_id.is_special() {
-        let chat = Chat::load_from_db(context, *chat_id).await?;
-        let new_status = match mime_parser.is_system_message {
-            SystemMessage::ChatProtectionEnabled => Some(ProtectionStatus::Protected),
-            SystemMessage::ChatProtectionDisabled => Some(ProtectionStatus::Unprotected),
-            _ => None,
-        };
-
-        if chat.is_protected() || new_status.is_some() {
-            if let Err(err) =
-                check_verified_properties(context, mime_parser, from_id as u32, to_ids).await
-            {
-                warn!(context, "verification problem: {}", err);
-                let s = format!("{}. See 'Info' for more details", err);
-                mime_parser.repl_msg_by_error(s);
-            } else {
-                // change chat protection only when verification check passes
-                if let Some(new_status) = new_status {
-                    if let Err(e) = chat_id.inner_set_protection(context, new_status).await {
-                        chat::add_info_msg(
-                            context,
-                            *chat_id,
-                            format!("Cannot set protection: {}", e),
-                        )
-                        .await;
-                        return Ok(()); // do not return an error as this would result in retrying the message
-                    }
-                    set_better_msg(
-                        mime_parser,
-                        context.stock_protection_msg(new_status, from_id).await,
-                    );
-                }
-            }
-        }
-    }
-
     // correct message_timestamp, it should not be used before,
     // however, we cannot do this earlier as we need from_id to be set
     let in_fresh = state == MessageState::InFresh;
@@ -772,6 +712,9 @@ async fn add_parts(
 
     *sent_timestamp = std::cmp::min(*sent_timestamp, rcvd_timestamp);
 
+    // unarchive chat
+    chat_id.unarchive(context).await?;
+
     // if the mime-headers should be saved, find out its size
     // (the mime-header ends with an empty line)
     let save_mime_headers = context.get_config_bool(Config::SaveMimeHeaders).await;
@@ -872,7 +815,7 @@ async fn add_parts(
                     mime_headers,
                     mime_in_reply_to,
                     mime_references,
-                    part.error.take().unwrap_or_default(),
+                    part.error,
                     ephemeral_timer,
                     ephemeral_timestamp
                 ])?;
@@ -893,10 +836,6 @@ async fn add_parts(
         *insert_msg_id = *id;
     }
 
-    if !is_hidden {
-        chat_id.unarchive(context).await?;
-    }
-
     *hidden = is_hidden;
     created_db_entries.extend(ids.iter().map(|id| (chat_id, *id)));
     mime_parser.parts = new_parts;
@@ -906,11 +845,6 @@ async fn add_parts(
         "Message has {} parts and is assigned to chat #{}.", icnt, chat_id,
     );
 
-    // new outgoing message from another device marks the chat as noticed.
-    if !incoming && !*hidden && !chat_id.is_special() {
-        chat::marknoticed_chat_if_older_than(context, chat_id, sort_timestamp).await?;
-    }
-
     // check event to send
     if chat_id.is_trash() || *hidden {
         *create_event_to_send = None;
@@ -1080,24 +1014,37 @@ async fn create_or_lookup_group(
         set_better_msg(mime_parser, &better_msg);
     }
 
-    let grpid = try_getting_grpid(mime_parser);
-
-    if grpid.is_empty() {
-        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
-        });
+    let mut grpid = "".to_string();
+    if let Some(optional_field) = mime_parser.get(HeaderDef::ChatGroupId) {
+        grpid = optional_field.clone();
     }
 
+    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
+            });
+        }
+    }
     // now we have a grpid that is non-empty
     // but we might not know about this group
 
@@ -1179,18 +1126,29 @@ async fn create_or_lookup_group(
     set_better_msg(mime_parser, &better_msg);
 
     // check, if we have a chat with this group ID
-    let (mut chat_id, _, _blocked) = chat::get_chat_id_by_grpid(context, &grpid)
+    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() && !chat::is_contact_in_chat(context, chat_id, from_id as u32).await {
-        // The From-address is not part of this group.
-        // It could be a new user or a DSN from a mailer-daemon.
-        // in any case we do not want to recreate the member list
-        // but still show the message as part of the chat.
-        // After all, the sender has a reference/in-reply-to that
-        // points to this chat.
-        let s = context.stock_str(StockMessage::UnknownSenderForChat).await;
-        mime_parser.repl_msg_by_error(s.to_string());
+    if !chat_id.is_unset() {
+        if chat_id_verified {
+            if let Err(err) =
+                check_verified_properties(context, mime_parser, from_id as u32, to_ids).await
+            {
+                warn!(context, "verification problem: {}", err);
+                let s = format!("{}. See 'Info' for more details", err);
+                mime_parser.repl_msg_by_error(s);
+            }
+        }
+        if !chat::is_contact_in_chat(context, chat_id, from_id as u32).await {
+            // The From-address is not part of this group.
+            // It could be a new user or a DSN from a mailer-daemon.
+            // in any case we do not want to recreate the member list
+            // but still show the message as part of the chat.
+            // After all, the sender has a reference/in-reply-to that
+            // points to this chat.
+            let s = context.stock_str(StockMessage::UnknownSenderForChat).await;
+            mime_parser.repl_msg_by_error(s.to_string());
+        }
     }
 
     // check if the group does not exist but should be created
@@ -1213,7 +1171,7 @@ async fn create_or_lookup_group(
                 || X_MrAddToGrp.is_some() && addr_cmp(&self_addr, X_MrAddToGrp.as_ref().unwrap()))
     {
         // group does not exist but should be created
-        let create_protected = if mime_parser.get(HeaderDef::ChatVerified).is_some() {
+        let create_verified = if mime_parser.get(HeaderDef::ChatVerified).is_some() {
             if let Err(err) =
                 check_verified_properties(context, mime_parser, from_id as u32, to_ids).await
             {
@@ -1221,9 +1179,9 @@ async fn create_or_lookup_group(
                 let s = format!("{}. See 'Info' for more details", err);
                 mime_parser.repl_msg_by_error(&s);
             }
-            ProtectionStatus::Protected
+            VerifiedStatus::Verified
         } else {
-            ProtectionStatus::Unprotected
+            VerifiedStatus::Unverified
         };
 
         if !allow_creation {
@@ -1236,22 +1194,11 @@ async fn create_or_lookup_group(
             &grpid,
             grpname.as_ref().unwrap(),
             create_blocked,
-            create_protected,
+            create_verified,
         )
         .await;
         chat_id_blocked = create_blocked;
         recreate_member_list = true;
-
-        // once, we have protected-chats explained in UI, we can uncomment the following lines.
-        // ("verified groups" did not add a message anyway)
-        //
-        //if create_protected == ProtectionStatus::Protected {
-        // set from_id=0 as it is not clear that the sender of this random group message
-        // actually really has enabled chat-protection at some point.
-        //chat_id
-        //    .add_protection_msg(context, ProtectionStatus::Protected, false, 0)
-        //    .await?;
-        //}
     }
 
     // again, check chat_id
@@ -1267,7 +1214,6 @@ async fn create_or_lookup_group(
         } else {
             // The message was decrypted successfully, but contains a late "quit" or otherwise
             // unwanted message.
-            info!(context, "message belongs to unwanted group (TRASH)");
             return Ok((ChatId::new(DC_CHAT_ID_TRASH), chat_id_blocked));
         }
     }
@@ -1304,10 +1250,7 @@ async fn create_or_lookup_group(
                 }
             }
         }
-    } else if mime_parser.is_system_message == SystemMessage::ChatProtectionEnabled {
-        recreate_member_list = true;
     }
-
     if let Some(avatar_action) = &mime_parser.group_avatar {
         info!(context, "group-avatar change for {}", chat_id);
         if let Ok(mut chat) = Chat::load_from_db(context, chat_id).await {
@@ -1367,27 +1310,6 @@ async fn create_or_lookup_group(
     Ok((chat_id, chat_id_blocked))
 }
 
-fn try_getting_grpid(mime_parser: &MimeMessage) -> String {
-    if let Some(optional_field) = mime_parser.get(HeaderDef::ChatGroupId) {
-        return optional_field.clone();
-    }
-
-    if let Some(extracted_grpid) = mime_parser
-        .get(HeaderDef::MessageId)
-        .and_then(|value| dc_extract_grpid_from_rfc724_mid(&value))
-    {
-        return extracted_grpid.to_string();
-    }
-    if !mime_parser.has_chat_version() {
-        if let Some(extracted_grpid) = extract_grpid(mime_parser, HeaderDef::InReplyTo) {
-            return extracted_grpid.to_string();
-        } else if let Some(extracted_grpid) = extract_grpid(mime_parser, HeaderDef::References) {
-            return extracted_grpid.to_string();
-        }
-    }
-    "".to_string()
-}
-
 /// try extract a grpid from a message-id list header value
 fn extract_grpid(mime_parser: &MimeMessage, headerdef: HeaderDef) -> Option<&str> {
     let header = mime_parser.get(headerdef)?;
@@ -1513,7 +1435,7 @@ async fn create_or_lookup_adhoc_group(
         &grpid,
         grpname,
         create_blocked,
-        ProtectionStatus::Unprotected,
+        VerifiedStatus::Unverified,
     )
     .await;
     for &member_id in &member_ids {
@@ -1530,17 +1452,20 @@ async fn create_group_record(
     grpid: impl AsRef<str>,
     grpname: impl AsRef<str>,
     create_blocked: Blocked,
-    create_protected: ProtectionStatus,
+    create_verified: VerifiedStatus,
 ) -> ChatId {
     if context.sql.execute(
-        "INSERT INTO chats (type, name, grpid, blocked, created_timestamp, protected) VALUES(?, ?, ?, ?, ?, ?);",
+        "INSERT INTO chats (type, name, grpid, blocked, created_timestamp) VALUES(?, ?, ?, ?, ?);",
         paramsv![
-            Chattype::Group,
+            if VerifiedStatus::Unverified != create_verified {
+                Chattype::VerifiedGroup
+            } else {
+                Chattype::Group
+            },
             grpname.as_ref(),
             grpid.as_ref(),
             create_blocked,
             time(),
-            create_protected,
         ],
     ).await
     .is_err()
@@ -1605,7 +1530,7 @@ async fn create_adhoc_grp_id(context: &Context, member_ids: &[u32]) -> String {
             },
         )
         .await
-        .unwrap_or(member_cs);
+        .unwrap_or_else(|_| member_cs);
 
     hex_hash(&members)
 }
@@ -1633,7 +1558,7 @@ async fn search_chat_ids_by_contact_ids(
             }
         }
         if !contact_ids.is_empty() {
-            contact_ids.sort_unstable();
+            contact_ids.sort();
             let contact_ids_str = join(contact_ids.iter().map(|x| x.to_string()), ",");
             context.sql.query_map(
                 format!(
@@ -1692,17 +1617,6 @@ async fn check_verified_properties(
 
     ensure!(mimeparser.was_encrypted(), "This message is not encrypted.");
 
-    if mimeparser.get(HeaderDef::ChatVerified).is_none() {
-        // we do not fail here currently, this would exclude (a) non-deltas
-        // and (b) deltas with different protection views across multiple devices.
-        // for group creation or protection enabled/disabled, however, Chat-Verified is respected.
-        warn!(
-            context,
-            "{} did not mark message as protected.",
-            contact.get_addr()
-        );
-    }
-
     // ensure, the contact is verified
     // and the message is signed with a verified key of the sender.
     // this check is skipped for SELF as there is no proper SELF-peerstate
@@ -1792,7 +1706,7 @@ async fn check_verified_properties(
         }
         if !is_verified {
             bail!(
-                "{} is not a member of this protected chat",
+                "{} is not a member of this verified group",
                 to_addr.to_string()
             );
         }
@@ -2228,7 +2142,7 @@ mod tests {
         let t = TestContext::new_alice().await;
 
         // create one-to-one with bob, archive one-to-one
-        let bob_id = Contact::create(&t.ctx, "bob", "bob@example.com")
+        let bob_id = Contact::create(&t.ctx, "bob", "bob@exampel.org")
             .await
             .unwrap();
         let one2one_id = chat::create_by_contact_id(&t.ctx, bob_id).await.unwrap();
@@ -2240,7 +2154,7 @@ mod tests {
         assert!(one2one.get_visibility() == ChatVisibility::Archived);
 
         // create a group with bob, archive group
-        let group_id = chat::create_group_chat(&t.ctx, ProtectionStatus::Unprotected, "foo")
+        let group_id = chat::create_group_chat(&t.ctx, VerifiedStatus::Unverified, "foo")
             .await
             .unwrap();
         chat::add_contact_to_chat(&t.ctx, group_id, bob_id).await;
@@ -2541,7 +2455,7 @@ mod tests {
             "shenauithz@testrun.org",
             "Mr.un2NYERi1RM.lbQ5F9q-QyJ@tiscali.it",
             include_bytes!("../test-data/message/tiscali_ndn.eml"),
-            None,
+            "",
         )
         .await;
     }
@@ -2553,7 +2467,7 @@ mod tests {
             "hcksocnsofoejx@five.chat",
             "Mr.A7pTA5IgrUA.q4bP41vAJOp@testrun.org",
             include_bytes!("../test-data/message/testrun_ndn.eml"),
-            Some("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)"),
+            "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;
     }
@@ -2565,7 +2479,7 @@ mod tests {
             "haeclirth.sinoenrat@yahoo.com",
             "1680295672.3657931.1591783872936@mail.yahoo.com",
             include_bytes!("../test-data/message/yahoo_ndn.eml"),
-            Some("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 [...]"),
+            "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;
     }
@@ -2577,7 +2491,7 @@ mod tests {
             "assidhfaaspocwaeofi@gmail.com",
             "CABXKi8zruXJc_6e4Dr087H5wE7sLp+u250o0N2q5DdjF_r-8wg@mail.gmail.com",
             include_bytes!("../test-data/message/gmail_ndn.eml"),
-            Some("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"),
+            "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;
     }
@@ -2589,7 +2503,7 @@ mod tests {
             "snaerituhaeirns@gmail.com",
             "9c9c2a32-056b-3592-c372-d7e8f0bd4bc2@gmx.de",
             include_bytes!("../test-data/message/gmx_ndn.eml"),
-            Some("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 [...]"),
+            "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;
     }
@@ -2601,7 +2515,7 @@ mod tests {
             "hanerthaertidiuea@gmx.de",
             "04422840-f884-3e37-5778-8192fe22d8e1@posteo.de",
             include_bytes!("../test-data/message/posteo_ndn.eml"),
-            Some("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)"),
+            "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;
     }
@@ -2612,7 +2526,7 @@ mod tests {
         foreign_addr: &str,
         rfc724_mid_outgoing: &str,
         raw_ndn: &[u8],
-        error_msg: Option<&str>,
+        error_msg: &str,
     ) {
         let t = TestContext::new().await;
         t.configure_addr(self_addr).await;
@@ -2655,8 +2569,7 @@ mod tests {
         let msg = Message::load_from_db(&t.ctx, msg_id).await.unwrap();
 
         assert_eq!(msg.state, MessageState::OutFailed);
-
-        assert_eq!(msg.error(), error_msg.map(|error| error.to_string()));
+        assert_eq!(msg.error, error_msg);
     }
 
     #[async_std::test]

src/dc_tools.rs

@@ -15,14 +15,9 @@ use async_std::{fs, io};
 use chrono::{Local, TimeZone};
 use rand::{thread_rng, Rng};
 
-use crate::chat::{add_device_msg, add_device_msg_with_importance};
-use crate::constants::{Viewtype, DC_OUTDATED_WARNING_DAYS};
 use crate::context::Context;
 use crate::error::{bail, Error};
 use crate::events::EventType;
-use crate::message::Message;
-use crate::provider::get_provider_update_timestamp;
-use crate::stock::StockMessage;
 
 /// Shortens a string to a specified length and adds "[...]" to the
 /// end of the shortened string.
@@ -156,73 +151,6 @@ pub(crate) async fn dc_create_smeared_timestamps(context: &Context, count: usize
     start
 }
 
-// if the system time is not plausible, once a day, add a device message.
-// for testing we're using time() as that is also used for message timestamps.
-// moreover, add a warning if the app is outdated.
-pub(crate) async fn maybe_add_time_based_warnings(context: &Context) {
-    if !maybe_warn_on_bad_time(context, time(), get_provider_update_timestamp()).await {
-        maybe_warn_on_outdated(context, time(), get_provider_update_timestamp()).await;
-    }
-}
-
-async fn maybe_warn_on_bad_time(context: &Context, now: i64, known_past_timestamp: i64) -> bool {
-    if now < known_past_timestamp {
-        let mut msg = Message::new(Viewtype::Text);
-        msg.text = Some(
-            context
-                .stock_string_repl_str(
-                    StockMessage::BadTimeMsgBody,
-                    Local
-                        .timestamp(now, 0)
-                        .format("%Y-%m-%d %H:%M:%S")
-                        .to_string(),
-                )
-                .await,
-        );
-        add_device_msg_with_importance(
-            context,
-            Some(
-                format!(
-                    "bad-time-warning-{}",
-                    chrono::NaiveDateTime::from_timestamp(now, 0).format("%Y-%m-%d") // repeat every day
-                )
-                .as_str(),
-            ),
-            Some(&mut msg),
-            true,
-        )
-        .await
-        .ok();
-        return true;
-    }
-    false
-}
-
-async fn maybe_warn_on_outdated(context: &Context, now: i64, approx_compile_time: i64) {
-    if now > approx_compile_time + DC_OUTDATED_WARNING_DAYS * 24 * 60 * 60 {
-        let mut msg = Message::new(Viewtype::Text);
-        msg.text = Some(
-            context
-                .stock_str(StockMessage::UpdateReminderMsgBody)
-                .await
-                .into(),
-        );
-        add_device_msg(
-            context,
-            Some(
-                format!(
-                    "outdated-warning-{}",
-                    chrono::NaiveDateTime::from_timestamp(now, 0).format("%Y-%m") // repeat every month
-                )
-                .as_str(),
-            ),
-            Some(&mut msg),
-        )
-        .await
-        .ok();
-    }
-}
-
 /* Message-ID tools */
 pub(crate) fn dc_create_id() -> String {
     /* generate an id. the generated ID should be as short and as unique as possible:
@@ -709,18 +637,6 @@ pub(crate) fn improve_single_line_input(input: impl AsRef<str>) -> String {
         .to_string()
 }
 
-pub(crate) trait IsNoneOrEmpty<T> {
-    fn is_none_or_empty(&self) -> bool;
-}
-impl<T> IsNoneOrEmpty<T> for Option<T>
-where
-    T: AsRef<str>,
-{
-    fn is_none_or_empty(&self) -> bool {
-        !matches!(self, Some(s) if !s.as_ref().is_empty())
-    }
-}
-
 #[cfg(test)]
 mod tests {
     #![allow(clippy::indexing_slicing)]
@@ -884,9 +800,6 @@ mod tests {
         assert_eq!("@d.tt".parse::<EmailAddress>().is_ok(), false);
     }
 
-    use crate::chat;
-    use crate::chatlist::Chatlist;
-    use chrono::{NaiveDate, NaiveDateTime, NaiveTime};
     use proptest::prelude::*;
 
     proptest! {
@@ -1080,132 +993,4 @@ mod tests {
         assert_eq!(improve_single_line_input("Hi\naiae "), "Hi aiae");
         assert_eq!(improve_single_line_input("\r\nahte\n\r"), "ahte");
     }
-
-    #[async_std::test]
-    async fn test_maybe_warn_on_bad_time() {
-        let t = TestContext::new().await;
-        let timestamp_now = time();
-        let timestamp_future = timestamp_now + 60 * 60 * 24 * 7;
-        let timestamp_past = NaiveDateTime::new(
-            NaiveDate::from_ymd(2020, 9, 1),
-            NaiveTime::from_hms(0, 0, 0),
-        )
-        .timestamp_millis()
-            / 1_000;
-
-        // a correct time must not add a device message
-        maybe_warn_on_bad_time(&t.ctx, timestamp_now, get_provider_update_timestamp()).await;
-        let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
-        assert_eq!(chats.len(), 0);
-
-        // we cannot find out if a date in the future is wrong - a device message is not added
-        maybe_warn_on_bad_time(&t.ctx, timestamp_future, get_provider_update_timestamp()).await;
-        let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
-        assert_eq!(chats.len(), 0);
-
-        // a date in the past must add a device message
-        maybe_warn_on_bad_time(&t.ctx, timestamp_past, get_provider_update_timestamp()).await;
-        let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
-        assert_eq!(chats.len(), 1);
-        let device_chat_id = chats.get_chat_id(0);
-        let msgs = chat::get_chat_msgs(&t.ctx, device_chat_id, 0, None).await;
-        assert_eq!(msgs.len(), 1);
-
-        // the message should be added only once a day - test that an hour later and nearly a day later
-        maybe_warn_on_bad_time(
-            &t.ctx,
-            timestamp_past + 60 * 60,
-            get_provider_update_timestamp(),
-        )
-        .await;
-        let msgs = chat::get_chat_msgs(&t.ctx, device_chat_id, 0, None).await;
-        assert_eq!(msgs.len(), 1);
-
-        maybe_warn_on_bad_time(
-            &t.ctx,
-            timestamp_past + 60 * 60 * 24 - 1,
-            get_provider_update_timestamp(),
-        )
-        .await;
-        let msgs = chat::get_chat_msgs(&t.ctx, device_chat_id, 0, None).await;
-        assert_eq!(msgs.len(), 1);
-
-        // next day, there should be another device message
-        maybe_warn_on_bad_time(
-            &t.ctx,
-            timestamp_past + 60 * 60 * 24,
-            get_provider_update_timestamp(),
-        )
-        .await;
-        let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
-        assert_eq!(chats.len(), 1);
-        assert_eq!(device_chat_id, chats.get_chat_id(0));
-        let msgs = chat::get_chat_msgs(&t.ctx, device_chat_id, 0, None).await;
-        assert_eq!(msgs.len(), 2);
-    }
-
-    #[async_std::test]
-    async fn test_maybe_warn_on_outdated() {
-        let t = TestContext::new().await;
-        let timestamp_now: i64 = time();
-
-        // in about 6 months, the app should not be outdated
-        // (if this fails, provider-db is not updated since 6 months)
-        maybe_warn_on_outdated(
-            &t.ctx,
-            timestamp_now + 180 * 24 * 60 * 60,
-            get_provider_update_timestamp(),
-        )
-        .await;
-        let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
-        assert_eq!(chats.len(), 0);
-
-        // in 1 year, the app should be considered as outdated
-        maybe_warn_on_outdated(
-            &t.ctx,
-            timestamp_now + 365 * 24 * 60 * 60,
-            get_provider_update_timestamp(),
-        )
-        .await;
-        let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
-        assert_eq!(chats.len(), 1);
-        let device_chat_id = chats.get_chat_id(0);
-        let msgs = chat::get_chat_msgs(&t.ctx, device_chat_id, 0, None).await;
-        assert_eq!(msgs.len(), 1);
-
-        // do not repeat the warning every day ...
-        // (we test that for the 2 subsequent days, this may be the next month, so the result should be 1 or 2 device message)
-        maybe_warn_on_outdated(
-            &t.ctx,
-            timestamp_now + (365 + 1) * 24 * 60 * 60,
-            get_provider_update_timestamp(),
-        )
-        .await;
-        maybe_warn_on_outdated(
-            &t.ctx,
-            timestamp_now + (365 + 2) * 24 * 60 * 60,
-            get_provider_update_timestamp(),
-        )
-        .await;
-        let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
-        assert_eq!(chats.len(), 1);
-        let device_chat_id = chats.get_chat_id(0);
-        let msgs = chat::get_chat_msgs(&t.ctx, device_chat_id, 0, None).await;
-        let test_len = msgs.len();
-        assert!(test_len == 1 || test_len == 2);
-
-        // ... but every month
-        // (forward generous 33 days to avoid being in the same month as in the previous check)
-        maybe_warn_on_outdated(
-            &t.ctx,
-            timestamp_now + (365 + 33) * 24 * 60 * 60,
-            get_provider_update_timestamp(),
-        )
-        .await;
-        let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
-        assert_eq!(chats.len(), 1);
-        let device_chat_id = chats.get_chat_id(0);
-        let msgs = chat::get_chat_msgs(&t.ctx, device_chat_id, 0, None).await;
-        assert_eq!(msgs.len(), test_len + 1);
-    }
 }

src/dehtml.rs

@@ -2,10 +2,12 @@
 //!
 //! A module to remove HTML tags from the email text
 
-use once_cell::sync::Lazy;
+use lazy_static::lazy_static;
 use quick_xml::events::{BytesEnd, BytesStart, BytesText};
 
-static LINE_RE: Lazy<regex::Regex> = Lazy::new(|| regex::Regex::new(r"(\r?\n)+").unwrap());
+lazy_static! {
+    static ref LINE_RE: regex::Regex = regex::Regex::new(r"(\r?\n)+").unwrap();
+}
 
 struct Dehtml {
     strbuilder: String,
@@ -22,16 +24,16 @@ enum AddText {
 
 // dehtml() returns way too many newlines; however, an optimisation on this issue is not needed as
 // the newlines are typically removed in further processing by the caller
-pub fn dehtml(buf: &str) -> Option<String> {
+pub fn dehtml(buf: &str) -> String {
     let s = dehtml_quick_xml(buf);
     if !s.trim().is_empty() {
-        return Some(s);
+        return s;
     }
     let s = dehtml_manually(buf);
     if !s.trim().is_empty() {
-        return Some(s);
+        return s;
     }
-    None
+    buf.to_string()
 }
 
 pub fn dehtml_quick_xml(buf: &str) -> String {
@@ -220,23 +222,21 @@ mod tests {
                 "<a href='https://get.delta.chat/'/>",
                 "[](https://get.delta.chat/)",
             ),
+            ("", ""),
             ("<!doctype html>\n<b>fat text</b>", "*fat text*"),
             // Invalid html (at least DC should show the text if the html is invalid):
             ("<!some invalid html code>\n<b>some text</b>", "some text"),
+            ("<This text is in brackets>", "<This text is in brackets>"),
         ];
         for (input, output) in cases {
-            assert_eq!(simplify(dehtml(input).unwrap(), true).0, output);
-        }
-        let none_cases = vec!["<html> </html>", ""];
-        for input in none_cases {
-            assert_eq!(dehtml(input), None);
+            assert_eq!(simplify(dehtml(input), true).0, output);
         }
     }
 
     #[test]
     fn test_dehtml_parse_br() {
         let html = "\r\r\nline1<br>\r\n\r\n\r\rline2<br/>line3\n\r";
-        let plain = dehtml(html).unwrap();
+        let plain = dehtml(html);
 
         assert_eq!(plain, "line1\n\r\r\rline2\nline3");
     }
@@ -244,7 +244,7 @@ mod tests {
     #[test]
     fn test_dehtml_parse_href() {
         let html = "<a href=url>text</a";
-        let plain = dehtml(html).unwrap();
+        let plain = dehtml(html);
 
         assert_eq!(plain, "[text](url)");
     }
@@ -252,7 +252,7 @@ mod tests {
     #[test]
     fn test_dehtml_bold_text() {
         let html = "<!DOCTYPE name [<!DOCTYPE ...>]><!-- comment -->text <b><?php echo ... ?>bold</b><![CDATA[<>]]>";
-        let plain = dehtml(html).unwrap();
+        let plain = dehtml(html);
 
         assert_eq!(plain, "text *bold*<>");
     }
@@ -262,7 +262,7 @@ mod tests {
         let html =
                 "&lt;&gt;&quot;&apos;&amp; &auml;&Auml;&ouml;&Ouml;&uuml;&Uuml;&szlig; foo&AElig;&ccedil;&Ccedil; &diams;&lrm;&rlm;&zwnj;&noent;&zwj;";
 
-        let plain = dehtml(html).unwrap();
+        let plain = dehtml(html);
 
         assert_eq!(
             plain,
@@ -285,7 +285,7 @@ mod tests {
         </body>
         </html>
         "##;
-        let txt = dehtml(input).unwrap();
+        let txt = dehtml(input);
         assert_eq!(txt.trim(), "lots of text");
     }
 }

src/e2ee.rs

@@ -51,42 +51,23 @@ impl EncryptHelper {
     }
 
     /// Determines if we can and should encrypt.
-    ///
-    /// For encryption to be enabled, `e2ee_guaranteed` should be true, or strictly more than a half
-    /// of peerstates should prefer encryption. Own preference is counted equally to peer
-    /// preferences, even if message copy is not sent to self.
-    ///
-    /// `e2ee_guaranteed` should be set to true for replies to encrypted messages (as required by
-    /// Autocrypt Level 1, version 1.1) and for messages sent in protected groups.
-    ///
-    /// Returns an error if `e2ee_guaranteed` is true, but one or more keys are missing.
     pub fn should_encrypt(
         &self,
         context: &Context,
         e2ee_guaranteed: bool,
         peerstates: &[(Option<Peerstate>, &str)],
     ) -> Result<bool> {
-        let mut prefer_encrypt_count = if self.prefer_encrypt == EncryptPreference::Mutual {
-            1
-        } else {
-            0
-        };
+        if !(self.prefer_encrypt == EncryptPreference::Mutual || e2ee_guaranteed) {
+            return Ok(false);
+        }
+
         for (peerstate, addr) in peerstates {
             match peerstate {
                 Some(peerstate) => {
-                    info!(
-                        context,
-                        "peerstate for {:?} is {}", addr, peerstate.prefer_encrypt
-                    );
-                    match peerstate.prefer_encrypt {
-                        EncryptPreference::NoPreference => {}
-                        EncryptPreference::Mutual => prefer_encrypt_count += 1,
-                        EncryptPreference::Reset => {
-                            if !e2ee_guaranteed {
-                                return Ok(false);
-                            }
-                        }
-                    };
+                    if peerstate.prefer_encrypt != EncryptPreference::Mutual && !e2ee_guaranteed {
+                        info!(context, "peerstate for {:?} is no-encrypt", addr);
+                        return Ok(false);
+                    }
                 }
                 None => {
                     let msg = format!("peerstate for {:?} missing, cannot encrypt", addr);
@@ -100,11 +81,7 @@ impl EncryptHelper {
             }
         }
 
-        // Count number of recipients, including self.
-        // This does not depend on whether we send a copy to self or not.
-        let recipients_count = peerstates.len() + 1;
-
-        Ok(e2ee_guaranteed || 2 * prefer_encrypt_count > recipients_count)
+        Ok(true)
     }
 
     /// Tries to encrypt the passed in `mail`.
@@ -235,9 +212,9 @@ fn get_autocrypt_mime<'a, 'b>(mail: &'a ParsedMail<'b>) -> Result<&'a ParsedMail
     }
 }
 
-async fn decrypt_if_autocrypt_message(
+async fn decrypt_if_autocrypt_message<'a>(
     context: &Context,
-    mail: &ParsedMail<'_>,
+    mail: &ParsedMail<'a>,
     private_keyring: Keyring<SignedSecretKey>,
     public_keyring_for_validate: Keyring<SignedPublicKey>,
     ret_valid_signatures: &mut HashSet<Fingerprint>,
@@ -511,59 +488,4 @@ Sent with my Delta Chat Messenger: https://delta.chat";
 
         Ok(())
     }
-
-    fn new_peerstates(
-        ctx: &Context,
-        prefer_encrypt: EncryptPreference,
-    ) -> Vec<(Option<Peerstate<'_>>, &str)> {
-        let addr = "bob@foo.bar";
-        let pub_key = bob_keypair().public;
-        let peerstate = Peerstate {
-            context: &ctx,
-            addr: addr.into(),
-            last_seen: 13,
-            last_seen_autocrypt: 14,
-            prefer_encrypt,
-            public_key: Some(pub_key.clone()),
-            public_key_fingerprint: Some(pub_key.fingerprint()),
-            gossip_key: Some(pub_key.clone()),
-            gossip_timestamp: 15,
-            gossip_key_fingerprint: Some(pub_key.fingerprint()),
-            verified_key: Some(pub_key.clone()),
-            verified_key_fingerprint: Some(pub_key.fingerprint()),
-            to_save: Some(ToSave::All),
-            fingerprint_changed: false,
-        };
-        let mut peerstates = Vec::new();
-        peerstates.push((Some(peerstate), addr));
-        peerstates
-    }
-
-    #[async_std::test]
-    async fn test_should_encrypt() {
-        let t = TestContext::new_alice().await;
-        let encrypt_helper = EncryptHelper::new(&t.ctx).await.unwrap();
-
-        // test with EncryptPreference::NoPreference:
-        // if e2ee_eguaranteed is unset, there is no encryption as not more than half of peers want encryption
-        let ps = new_peerstates(&t.ctx, EncryptPreference::NoPreference);
-        assert!(encrypt_helper.should_encrypt(&t.ctx, true, &ps).unwrap());
-        assert!(!encrypt_helper.should_encrypt(&t.ctx, false, &ps).unwrap());
-
-        // test with EncryptPreference::Reset
-        let ps = new_peerstates(&t.ctx, EncryptPreference::Reset);
-        assert!(encrypt_helper.should_encrypt(&t.ctx, true, &ps).unwrap());
-        assert!(!encrypt_helper.should_encrypt(&t.ctx, false, &ps).unwrap());
-
-        // test with EncryptPreference::Mutual (self is also Mutual)
-        let ps = new_peerstates(&t.ctx, EncryptPreference::Mutual);
-        assert!(encrypt_helper.should_encrypt(&t.ctx, true, &ps).unwrap());
-        assert!(encrypt_helper.should_encrypt(&t.ctx, false, &ps).unwrap());
-
-        // test with missing peerstate
-        let mut ps = Vec::new();
-        ps.push((None, "bob@foo.bar"));
-        assert!(encrypt_helper.should_encrypt(&t.ctx, true, &ps).is_err());
-        assert!(!encrypt_helper.should_encrypt(&t.ctx, false, &ps).unwrap());
-    }
 }

src/events.rs

@@ -58,18 +58,12 @@ impl EventEmitter {
 
     /// Async recv of an event. Return `None` if the `Sender` has been droped.
     pub async fn recv(&self) -> Option<Event> {
+        // TODO: change once we can use async channels internally.
         self.0.recv().await.ok()
     }
-}
 
-impl async_std::stream::Stream for EventEmitter {
-    type Item = Event;
-
-    fn poll_next(
-        mut self: std::pin::Pin<&mut Self>,
-        cx: &mut std::task::Context<'_>,
-    ) -> std::task::Poll<Option<Self::Item>> {
-        std::pin::Pin::new(&mut self.0).poll_next(cx)
+    pub fn try_recv(&self) -> Result<Event, async_std::sync::TryRecvError> {
+        self.0.try_recv()
     }
 }
 
@@ -192,11 +186,6 @@ pub enum EventType {
     #[strum(props(id = "2005"))]
     IncomingMsg { chat_id: ChatId, msg_id: MsgId },
 
-    /// Messages were seen or noticed.
-    /// chat id is always set.
-    #[strum(props(id = "2008"))]
-    MsgsNoticed(ChatId),
-
     /// A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to
     /// DC_STATE_OUT_DELIVERED, see dc_msg_get_state().
     #[strum(props(id = "2010"))]

src/format_flowed.rs

@@ -21,28 +21,21 @@
 /// length. However, this should be rare and should not result in
 /// immediate mail rejection: SMTP (RFC 2821) limit is 998 characters,
 /// and Spam Assassin limit is 78 characters.
-fn format_line_flowed(line: &str, prefix: &str) -> String {
+fn format_line_flowed(line: &str) -> String {
     let mut result = String::new();
-    let mut buffer = prefix.to_string();
+    let mut buffer = String::new();
     let mut after_space = false;
 
     for c in line.chars() {
         if c == ' ' {
             buffer.push(c);
             after_space = true;
-        } else if c == '>' {
-            if buffer.is_empty() {
-                // Space stuffing, see RFC 3676
-                buffer.push(' ');
-            }
-            buffer.push(c);
-            after_space = false;
         } else {
-            if after_space && buffer.len() >= 72 && !c.is_whitespace() {
+            if after_space && buffer.len() >= 72 && !c.is_whitespace() && c != '>' {
                 // Flush the buffer and insert soft break (SP CRLF).
                 result += &buffer;
                 result += "\r\n";
-                buffer = prefix.to_string();
+                buffer = String::new();
             }
             buffer.push(c);
             after_space = false;
@@ -51,28 +44,6 @@ fn format_line_flowed(line: &str, prefix: &str) -> String {
     result + &buffer
 }
 
-fn format_flowed_prefix(text: &str, prefix: &str) -> String {
-    let mut result = String::new();
-
-    for line in text.split('\n') {
-        if !result.is_empty() {
-            result += "\r\n";
-        }
-        let line = line.trim_end();
-        if prefix.len() + line.len() > 78 {
-            result += &format_line_flowed(line, prefix);
-        } else {
-            result += prefix;
-            if prefix.is_empty() && line.starts_with('>') {
-                // Space stuffing, see RFC 3676
-                result.push(' ');
-            }
-            result += line;
-        }
-    }
-    result
-}
-
 /// Returns text formatted according to RFC 3767 (format=flowed).
 ///
 /// This function accepts text separated by LF, but returns text
@@ -81,12 +52,20 @@ fn format_flowed_prefix(text: &str, prefix: &str) -> String {
 /// RFC 2646 technique is used to insert soft line breaks, so DelSp
 /// SHOULD be set to "no" when sending.
 pub fn format_flowed(text: &str) -> String {
-    format_flowed_prefix(text, "")
-}
+    let mut result = String::new();
 
-/// Same as format_flowed(), but adds "> " prefix to each line.
-pub fn format_flowed_quote(text: &str) -> String {
-    format_flowed_prefix(text, "> ")
+    for line in text.split('\n') {
+        if !result.is_empty() {
+            result += "\r\n";
+        }
+        let line = line.trim_end();
+        if line.len() > 78 {
+            result += &format_line_flowed(line);
+        } else {
+            result += line;
+        }
+    }
+    result
 }
 
 /// Joins lines in format=flowed text.
@@ -143,9 +122,6 @@ mod tests {
                         To decrypt and use your key, open the message in an Autocrypt-compliant \r\n\
                         client and enter the setup code presented on the generating device.";
         assert_eq!(format_flowed(text), expected);
-
-        let text = "> Not a quote";
-        assert_eq!(format_flowed(text), " > Not a quote");
     }
 
     #[test]
@@ -157,21 +133,4 @@ mod tests {
                         unwrapped on the receiver";
         assert_eq!(unformat_flowed(text, false), expected);
     }
-
-    #[test]
-    fn test_format_flowed_quote() {
-        let quote = "this is a quoted line";
-        let expected = "> this is a quoted line";
-        assert_eq!(format_flowed_quote(quote), expected);
-
-        let quote = "> foo bar baz";
-        let expected = "> > foo bar baz";
-        assert_eq!(format_flowed_quote(quote), expected);
-
-        let quote = "this is a very long quote that should be wrapped using format=flowed and unwrapped on the receiver";
-        let expected =
-            "> this is a very long quote that should be wrapped using format=flowed and \r\n\
-            > unwrapped on the receiver";
-        assert_eq!(format_flowed_quote(quote), expected);
-    }
 }

src/imap/idle.rs

@@ -113,13 +113,12 @@ impl Imap {
         // 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() {
-            info!(context, "IMAP-fake-IDLE: no folder, waiting for interrupt");
             return self.idle_interrupt.recv().await.unwrap_or_default();
         }
-        info!(context, "IMAP-fake-IDLEing folder={:?}", watch_folder);
 
         // check every minute if there are new messages
         // TODO: grow sleep durations / make them more flexible
@@ -161,7 +160,7 @@ impl Imap {
                     // will not find any new.
 
                     if let Some(ref watch_folder) = watch_folder {
-                        match self.fetch_new_messages(context, watch_folder, false).await {
+                        match self.fetch_new_messages(context, watch_folder).await {
                             Ok(res) => {
                                 info!(context, "fetch_new_messages returned {:?}", res);
                                 if res {

src/imap/mod.rs

@@ -3,9 +3,8 @@
 //! uses [async-email/async-imap](https://github.com/async-email/async-imap)
 //! to implement connect, fetch, delete functionality with standard IMAP servers.
 
-use std::{cmp, collections::BTreeMap};
+use std::collections::BTreeMap;
 
-use anyhow::Context as _;
 use async_imap::{
     error::Result as ImapResult,
     types::{Capability, Fetch, Flag, Mailbox, Name, NameAttribute},
@@ -14,9 +13,12 @@ use async_std::prelude::*;
 use async_std::sync::Receiver;
 use num_traits::FromPrimitive;
 
+use crate::config::*;
 use crate::constants::*;
 use crate::context::Context;
-use crate::dc_receive_imf::{from_field_to_contact_id, is_msgrmsg_rfc724_mid_in_list};
+use crate::dc_receive_imf::{
+    dc_receive_imf, from_field_to_contact_id, is_msgrmsg_rfc724_mid_in_list,
+};
 use crate::error::{bail, format_err, Result};
 use crate::events::EventType;
 use crate::headerdef::{HeaderDef, HeaderDefMap};
@@ -30,7 +32,6 @@ use crate::provider::{get_provider_info, Socket};
 use crate::{
     chat, dc_tools::dc_extract_grpid_from_rfc724_mid, scheduler::InterruptInfo, stock::StockMessage,
 };
-use crate::{config::*, dc_receive_imf::dc_receive_imf_inner};
 
 mod client;
 mod idle;
@@ -39,7 +40,6 @@ mod session;
 
 use chat::get_chat_id_by_grpid;
 use client::Client;
-use mailparse::SingleInfo;
 use message::Message;
 use session::Session;
 
@@ -229,7 +229,19 @@ impl Imap {
                 }
             }
             Err(err) => {
-                bail!(err);
+                let message = {
+                    let config = &self.config;
+                    let imap_server: &str = config.lp.server.as_ref();
+                    let imap_port = config.lp.port;
+                    context
+                        .stock_string_repl_str2(
+                            StockMessage::ServerResponse,
+                            format!("IMAP {}:{}", imap_server, imap_port),
+                            err.to_string(),
+                        )
+                        .await
+                };
+                bail!("{}: {}", message, err);
             }
         };
 
@@ -274,7 +286,7 @@ impl Imap {
                 }
 
                 self.trigger_reconnect();
-                Err(format_err!("{}\n\n{}", message, err))
+                Err(format_err!("{}: {}", message, err))
             }
         }
     }
@@ -448,15 +460,38 @@ impl Imap {
         }
         self.setup_handle(context).await?;
 
-        while self
-            .fetch_new_messages(context, &watch_folder, false)
-            .await?
-        {
+        while self.fetch_new_messages(context, &watch_folder).await? {
             // We fetch until no more new messages are there.
         }
         Ok(())
     }
 
+    async fn get_config_last_seen_uid<S: AsRef<str>>(
+        &self,
+        context: &Context,
+        folder: S,
+    ) -> (u32, u32) {
+        let key = format!("imap.mailbox.{}", folder.as_ref());
+        if let Some(entry) = context.sql.get_raw_config(context, &key).await {
+            // the entry has the format `imap.mailbox.<folder>=<uidvalidity>:<lastseenuid>`
+            let mut parts = entry.split(':');
+            (
+                parts
+                    .next()
+                    .unwrap_or_default()
+                    .parse()
+                    .unwrap_or_else(|_| 0),
+                parts
+                    .next()
+                    .unwrap_or_default()
+                    .parse()
+                    .unwrap_or_else(|_| 0),
+            )
+        } else {
+            (0, 0)
+        }
+    }
+
     /// Synchronizes UIDs in the database with UIDs on the server.
     ///
     /// It is assumed that no operations are taking place on the same
@@ -541,7 +576,7 @@ impl Imap {
         self.select_folder(context, Some(folder)).await?;
 
         // compare last seen UIDVALIDITY against the current one
-        let (uid_validity, last_seen_uid) = get_config_last_seen_uid(context, &folder).await;
+        let (uid_validity, last_seen_uid) = self.get_config_last_seen_uid(context, &folder).await;
 
         let config = &mut self.config;
         let mailbox = config
@@ -567,7 +602,8 @@ impl Imap {
             // id we do not do this here, we'll miss the first message
             // as we will get in here again and fetch from lastseenuid+1 then
 
-            set_config_last_seen_uid(context, &folder, new_uid_validity, 0).await;
+            self.set_config_last_seen_uid(context, &folder, new_uid_validity, 0)
+                .await;
             return Ok((new_uid_validity, 0));
         }
 
@@ -611,7 +647,8 @@ impl Imap {
             }
         };
 
-        set_config_last_seen_uid(context, &folder, new_uid_validity, new_last_seen_uid).await;
+        self.set_config_last_seen_uid(context, &folder, new_uid_validity, new_last_seen_uid)
+            .await;
         if uid_validity != 0 || last_seen_uid != 0 {
             job::schedule_resync(context).await;
         }
@@ -626,11 +663,10 @@ impl Imap {
         Ok((new_uid_validity, new_last_seen_uid))
     }
 
-    pub(crate) async fn fetch_new_messages<S: AsRef<str>>(
+    async fn fetch_new_messages<S: AsRef<str>>(
         &mut self,
         context: &Context,
         folder: S,
-        fetch_existing_msgs: bool,
     ) -> Result<bool> {
         let show_emails = ShowEmails::from_i32(context.get_config_int(Config::ShowEmails).await)
             .unwrap_or_default();
@@ -639,11 +675,7 @@ impl Imap {
             .select_with_uidvalidity(context, folder.as_ref())
             .await?;
 
-        let msgs = if fetch_existing_msgs {
-            self.fetch_existing_msgs_prefetch().await?
-        } else {
-            self.fetch_after(context, last_seen_uid).await?
-        };
+        let msgs = self.fetch_after(context, last_seen_uid).await?;
         let read_cnt = msgs.len();
         let folder: &str = folder.as_ref();
 
@@ -683,9 +715,8 @@ impl Imap {
         }
 
         // check passed, go fetch the emails
-        let (new_last_seen_uid_processed, error_cnt) = self
-            .fetch_many_msgs(context, &folder, &uids, fetch_existing_msgs)
-            .await;
+        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
@@ -694,7 +725,8 @@ impl Imap {
         let last_one = new_last_seen_uid.max(new_last_seen_uid_processed);
 
         if last_one > last_seen_uid {
-            set_config_last_seen_uid(context, &folder, uid_validity, last_one).await;
+            self.set_config_last_seen_uid(context, &folder, uid_validity, last_one)
+                .await;
         }
 
         if read_errors == 0 {
@@ -709,66 +741,17 @@ impl Imap {
         Ok(read_cnt > 0)
     }
 
-    /// Gets the from, to and bcc addresses from all existing outgoing emails.
-    pub async fn get_all_recipients(&mut self, context: &Context) -> Result<Vec<SingleInfo>> {
-        if self.session.is_none() {
-            bail!("IMAP No Connection established");
-        }
-
-        let session = self.session.as_mut().unwrap();
-        let self_addr = context
-            .get_config(Config::ConfiguredAddr)
-            .await
-            .ok_or_else(|| format_err!("Not configured"))?;
-
-        let search_command = format!("FROM \"{}\"", self_addr);
-        let uids = session.uid_search(search_command).await?;
-        let uid_strings: Vec<String> = uids.into_iter().map(|s| s.to_string()).collect();
-
-        let mut result = Vec::new();
-        // We fetch the emails in chunks of 100 because according to https://tools.ietf.org/html/rfc2683#section-3.2.1.5
-        // command lines should not be much more than 1000 chars and UIDs can get up to 9- or 10-digit
-        // (servers should allow at least 8000 chars)
-        for uid_chunk in uid_strings.chunks(100) {
-            let uid_set = uid_chunk.join(",");
-
-            let mut list = session
-                .uid_fetch(uid_set, "(UID BODY.PEEK[HEADER.FIELDS (FROM TO CC BCC)])")
-                .await
-                .map_err(|err| {
-                    format_err!("IMAP Could not fetch (get_all_recipients()): {}", err)
-                })?;
-
-            while let Some(fetch) = list.next().await {
-                let msg = fetch?;
-                match get_fetch_headers(&msg) {
-                    Ok(headers) => {
-                        let (from_id, _, _) =
-                            from_field_to_contact_id(context, &mimeparser::get_from(&headers))
-                                .await?;
-                        if from_id == DC_CONTACT_ID_SELF {
-                            result.extend(mimeparser::get_recipients(&headers));
-                        }
-                    }
-
-                    Err(err) => {
-                        warn!(context, "{}", err);
-                        continue;
-                    }
-                };
-            }
-        }
-        Ok(result)
-    }
-
     /// 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>> {
-        let session = self.session.as_mut();
-        let session = session.context("fetch_after(): IMAP No Connection established")?;
+        if self.session.is_none() {
+            bail!("IMAP No Connection established");
+        }
+
+        let session = self.session.as_mut().unwrap();
 
         // fetch messages with larger UID than the last one seen
         // `(UID FETCH lastseenuid+1:*)`, see RFC 4549
@@ -806,38 +789,21 @@ impl Imap {
         Ok(new_msgs)
     }
 
-    /// Like fetch_after(), but not for new messages but existing ones (the DC_FETCH_EXISTING_MSGS_COUNT newest messages)
-    async fn fetch_existing_msgs_prefetch(
-        &mut self,
-    ) -> Result<BTreeMap<u32, async_imap::types::Fetch>> {
-        let exists: i64 = {
-            let mailbox = self.config.selected_mailbox.as_ref();
-            let mailbox = mailbox.context("fetch_existing_msgs_prefetch(): no mailbox selected")?;
-            mailbox.exists.into()
-        };
-        let session = self.session.as_mut();
-        let session =
-            session.context("fetch_existing_msgs_prefetch(): IMAP No Connection established")?;
+    async fn set_config_last_seen_uid<S: AsRef<str>>(
+        &self,
+        context: &Context,
+        folder: S,
+        uidvalidity: u32,
+        lastseenuid: u32,
+    ) {
+        let key = format!("imap.mailbox.{}", folder.as_ref());
+        let val = format!("{}:{}", uidvalidity, lastseenuid);
 
-        // Fetch last DC_FETCH_EXISTING_MSGS_COUNT (100) messages.
-        // Sequence numbers are sequential. If there are 1000 messages in the inbox,
-        // we can fetch the sequence numbers 900-1000 and get the last 100 messages.
-        let first = cmp::max(1, exists - DC_FETCH_EXISTING_MSGS_COUNT);
-        let set = format!("{}:*", first);
-        let mut list = session
-            .fetch(&set, PREFETCH_FLAGS)
+        context
+            .sql
+            .set_raw_config(context, &key, Some(&val))
             .await
-            .map_err(|err| format_err!("IMAP Could not fetch: {}", err))?;
-
-        let mut msgs = BTreeMap::new();
-        while let Some(fetch) = list.next().await {
-            let msg = fetch?;
-            if let Some(msg_uid) = msg.uid {
-                msgs.insert(msg_uid, msg);
-            }
-        }
-
-        Ok(msgs)
+            .ok();
     }
 
     /// Fetches a list of messages by server UID.
@@ -849,7 +815,6 @@ impl Imap {
         context: &Context,
         folder: S,
         server_uids: &[u32],
-        fetching_existing_messages: bool,
     ) -> (Option<u32>, usize) {
         let set = match server_uids {
             [] => return (None, 0),
@@ -923,16 +888,7 @@ impl Imap {
             let body = msg.body().unwrap();
             let is_seen = msg.flags().any(|flag| flag == Flag::Seen);
 
-            match dc_receive_imf_inner(
-                &context,
-                &body,
-                &folder,
-                server_uid,
-                is_seen,
-                fetching_existing_messages,
-            )
-            .await
-            {
+            match dc_receive_imf(&context, &body, &folder, server_uid, is_seen).await {
                 Ok(_) => last_uid = Some(server_uid),
                 Err(err) => {
                     warn!(context, "dc_receive_imf error: {}", err);
@@ -1310,9 +1266,7 @@ impl Imap {
                 } 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.name())
-                {
+                } 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());
@@ -1391,43 +1345,11 @@ impl Imap {
 // only watching this folder is not working. at least, this is no show stopper.
 // CAVE: if possible, take care not to add a name here that is "sent" in one language
 // but sth. different in others - a hard job.
-fn get_folder_meaning_by_name(folder_name: &str) -> FolderMeaning {
-    // source: https://stackoverflow.com/questions/2185391/localized-gmail-imap-folders
-    let sent_names = vec![
-        "sent",
-        "sentmail",
-        "sent objects",
-        "gesendet",
-        "Sent Mail",
-        "Sendte e-mails",
-        "Enviados",
-        "Messages envoyés",
-        "Messages envoyes",
-        "Posta inviata",
-        "Verzonden berichten",
-        "Wyslane",
-        "E-mails enviados",
-        "Correio enviado",
-        "Enviada",
-        "Enviado",
-        "Gönderildi",
-        "Inviati",
-        "Odeslaná pošta",
-        "Sendt",
-        "Skickat",
-        "Verzonden",
-        "Wysłane",
-        "Éléments envoyés",
-        "Απεσταλμένα",
-        "Отправленные",
-        "寄件備份",
-        "已发送邮件",
-        "送信済み",
-        "보낸편지함",
-    ];
-    let lower = folder_name.to_lowercase();
+fn get_folder_meaning_by_name(folder_name: &Name) -> FolderMeaning {
+    let sent_names = vec!["sent", "sentmail", "sent objects", "gesendet"];
+    let lower = folder_name.name().to_lowercase();
 
-    if sent_names.into_iter().any(|s| s.to_lowercase() == lower) {
+    if sent_names.into_iter().any(|s| s == lower) {
         FolderMeaning::SentObjects
     } else {
         FolderMeaning::Unknown
@@ -1521,16 +1443,17 @@ 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;
-            if let Ok(message_state) = msg_id.get_state(context).await {
-                if message_state == MessageState::InSeen || message_state.is_outgoing() {
-                    job::add(
-                        context,
-                        job::Job::new(Action::MarkseenMsgOnImap, msg_id.to_u32(), Params::new(), 0),
-                    )
-                    .await;
-                }
-            }
-            info!(context, "Updating server_uid and adding markseen job");
+            if let Ok(MessageState::InSeen) = msg_id.get_state(context).await {
+                job::add(
+                    context,
+                    job::Job::new(Action::MarkseenMsgOnImap, msg_id.to_u32(), Params::new(), 0),
+                )
+                .await;
+            };
+            context
+                .interrupt_inbox(InterruptInfo::new(false, Some(msg_id)))
+                .await;
+            info!(context, "Updating server_uid and interrupting")
         }
         Ok(true)
     } else {
@@ -1672,62 +1595,3 @@ async fn message_needs_processing(
 fn get_fallback_folder(delimiter: &str) -> String {
     format!("INBOX{}DeltaChat", delimiter)
 }
-
-pub async fn set_config_last_seen_uid<S: AsRef<str>>(
-    context: &Context,
-    folder: S,
-    uidvalidity: u32,
-    lastseenuid: u32,
-) {
-    let key = format!("imap.mailbox.{}", folder.as_ref());
-    let val = format!("{}:{}", uidvalidity, lastseenuid);
-
-    context
-        .sql
-        .set_raw_config(context, &key, Some(&val))
-        .await
-        .ok();
-}
-
-async fn get_config_last_seen_uid<S: AsRef<str>>(context: &Context, folder: S) -> (u32, u32) {
-    let key = format!("imap.mailbox.{}", folder.as_ref());
-    if let Some(entry) = context.sql.get_raw_config(context, &key).await {
-        // the entry has the format `imap.mailbox.<folder>=<uidvalidity>:<lastseenuid>`
-        let mut parts = entry.split(':');
-        (
-            parts.next().unwrap_or_default().parse().unwrap_or(0),
-            parts.next().unwrap_or_default().parse().unwrap_or(0),
-        )
-    } else {
-        (0, 0)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    #[test]
-    fn test_get_folder_meaning_by_name() {
-        assert_eq!(
-            get_folder_meaning_by_name("Gesendet"),
-            FolderMeaning::SentObjects
-        );
-        assert_eq!(
-            get_folder_meaning_by_name("GESENDET"),
-            FolderMeaning::SentObjects
-        );
-        assert_eq!(
-            get_folder_meaning_by_name("gesendet"),
-            FolderMeaning::SentObjects
-        );
-        assert_eq!(
-            get_folder_meaning_by_name("Messages envoyés"),
-            FolderMeaning::SentObjects
-        );
-        assert_eq!(
-            get_folder_meaning_by_name("mEsSaGes envoyÉs"),
-            FolderMeaning::SentObjects
-        );
-        assert_eq!(get_folder_meaning_by_name("xxx"), FolderMeaning::Unknown);
-    }
-}

src/imex.rs

@@ -6,7 +6,6 @@ use std::{
     ffi::OsStr,
 };
 
-use anyhow::Context as _;
 use async_std::path::{Path, PathBuf};
 use async_std::{
     fs::{self, File},
@@ -31,7 +30,6 @@ use crate::param::*;
 use crate::pgp;
 use crate::sql::{self, Sql};
 use crate::stock::StockMessage;
-use ::pgp::types::KeyTrait;
 use async_tar::Archive;
 
 // Name of the database file in the backup.
@@ -79,7 +77,11 @@ pub enum ImexMode {
 ///
 /// Only one import-/export-progress can run at the same time.
 /// To cancel an import-/export-progress, drop the future returned by this function.
-pub async fn imex(context: &Context, what: ImexMode, param1: impl AsRef<Path>) -> Result<()> {
+pub async fn imex(
+    context: &Context,
+    what: ImexMode,
+    param1: Option<impl AsRef<Path>>,
+) -> Result<()> {
     let cancel = context.alloc_ongoing().await?;
 
     let res = async {
@@ -92,8 +94,7 @@ pub async fn imex(context: &Context, what: ImexMode, param1: impl AsRef<Path>) -
             }
             Err(err) => {
                 cleanup_aborted_imex(context, what).await;
-                // We are using Anyhow's .context() and to show the inner error, too, we need the {:#}:
-                error!(context, "{:#}", err);
+                error!(context, "{}", err);
                 context.emit_event(EventType::ImexProgress(0));
                 bail!("IMEX FAILED to complete: {}", err);
             }
@@ -117,9 +118,7 @@ async fn cleanup_aborted_imex(context: &Context, what: ImexMode) {
         dc_delete_files_in_dir(context, context.get_blobdir()).await;
     }
     if what == ImexMode::ExportBackup || what == ImexMode::ImportBackup {
-        if let Err(e) = context.sql.open(context, context.get_dbfile(), false).await {
-            warn!(context, "Re-opening db after imex failed: {}", e);
-        }
+        context.sql.open(context, context.get_dbfile(), false).await;
     }
 }
 
@@ -167,23 +166,17 @@ pub async fn has_backup_old(context: &Context, dir_name: impl AsRef<Path>) -> Re
             let name = name.to_string_lossy();
             if name.starts_with("delta-chat") && name.ends_with(".bak") {
                 let sql = Sql::new();
-                match sql.open(context, &path, true).await {
-                    Ok(_) => {
-                        let curr_backup_time = sql
-                            .get_raw_config_int(context, "backup_time")
-                            .await
-                            .unwrap_or_default();
-                        if curr_backup_time > newest_backup_time {
-                            newest_backup_path = Some(path);
-                            newest_backup_time = curr_backup_time;
-                        }
-                        info!(context, "backup_time of {} is {}", name, curr_backup_time);
-                        sql.close().await;
+                if sql.open(context, &path, true).await {
+                    let curr_backup_time = sql
+                        .get_raw_config_int(context, "backup_time")
+                        .await
+                        .unwrap_or_default();
+                    if curr_backup_time > newest_backup_time {
+                        newest_backup_path = Some(path);
+                        newest_backup_time = curr_backup_time;
                     }
-                    Err(e) => warn!(
-                        context,
-                        "Found backup file {} which could not be opened: {}", name, e
-                    ),
+                    info!(context, "backup_time of {} is {}", name, curr_backup_time);
+                    sql.close().await;
                 }
             }
         }
@@ -410,8 +403,6 @@ async fn set_self_key(
         },
     )
     .await?;
-
-    info!(context, "stored self key: {:?}", keypair.secret.key_id());
     Ok(())
 }
 
@@ -438,11 +429,19 @@ pub fn normalize_setup_code(s: &str) -> String {
     out
 }
 
-async fn imex_inner(context: &Context, what: ImexMode, path: impl AsRef<Path>) -> Result<()> {
-    info!(context, "Import/export dir: {}", path.as_ref().display());
-    ensure!(context.sql.is_open().await, "Database not opened.");
+async fn imex_inner(
+    context: &Context,
+    what: ImexMode,
+    param: Option<impl AsRef<Path>>,
+) -> Result<()> {
+    ensure!(param.is_some(), "No Import/export dir/file given.");
+
+    info!(context, "Import/export process started.");
     context.emit_event(EventType::ImexProgress(10));
 
+    ensure!(context.sql.is_open().await, "Database not opened.");
+
+    let path = param.ok_or_else(|| format_err!("Imex: Param was None"))?;
     if what == ImexMode::ExportBackup || what == ImexMode::ExportSelfKeys {
         // before we export anything, make sure the private key exists
         if e2ee::ensure_secret_key_exists(context).await.is_err() {
@@ -521,11 +520,13 @@ async fn import_backup(context: &Context, backup_to_import: impl AsRef<Path>) ->
         }
     }
 
-    context
-        .sql
-        .open(&context, &context.get_dbfile(), false)
-        .await
-        .context("Could not re-open db")?;
+    ensure!(
+        context
+            .sql
+            .open(&context, &context.get_dbfile(), false)
+            .await,
+        "could not re-open db"
+    );
 
     delete_and_reset_all_device_msgs(&context).await?;
 
@@ -557,11 +558,13 @@ async fn import_backup_old(context: &Context, backup_to_import: impl AsRef<Path>
     );
     /* error already logged */
     /* re-open copied database file */
-    context
-        .sql
-        .open(&context, &context.get_dbfile(), false)
-        .await
-        .context("Could not re-open db")?;
+    ensure!(
+        context
+            .sql
+            .open(&context, &context.get_dbfile(), false)
+            .await,
+        "could not re-open db"
+    );
 
     delete_and_reset_all_device_msgs(&context).await?;
 
@@ -740,7 +743,7 @@ async fn export_backup_old(context: &Context, dir: impl AsRef<Path>) -> Result<(
     context
         .sql
         .open(&context, &context.get_dbfile(), false)
-        .await?;
+        .await;
 
     if !copied {
         bail!(
@@ -750,11 +753,11 @@ async fn export_backup_old(context: &Context, dir: impl AsRef<Path>) -> Result<(
         );
     }
     let dest_sql = Sql::new();
-    dest_sql
-        .open(context, &dest_path_filename, false)
-        .await
-        .with_context(|| format!("could not open exported database {}", dest_path_string))?;
-
+    ensure!(
+        dest_sql.open(context, &dest_path_filename, false).await,
+        "could not open exported database {}",
+        dest_path_string
+    );
     let res = match add_files_to_export(context, &dest_sql).await {
         Err(err) => {
             dc_delete_file(context, &dest_path_filename).await;
@@ -866,12 +869,6 @@ async fn import_self_keys(context: &Context, dir: impl AsRef<Path>) -> Result<()
                 continue;
             }
         }
-        info!(
-            context,
-            "considering key file: {}",
-            path_plus_name.display()
-        );
-
         match dc_read_file(context, &path_plus_name).await {
             Ok(buf) => {
                 let armored = std::string::String::from_utf8_lossy(&buf);
@@ -961,7 +958,7 @@ where
         let any_key = key as &dyn Any;
         let kind = if any_key.downcast_ref::<SignedPublicKey>().is_some() {
             "public"
-        } else if any_key.downcast_ref::<SignedSecretKey>().is_some() {
+        } else if any_key.downcast_ref::<SignedPublicKey>().is_some() {
             "private"
         } else {
             "unknown"
@@ -969,12 +966,7 @@ where
         let id = id.map_or("default".into(), |i| i.to_string());
         dir.as_ref().join(format!("{}-key-{}.asc", kind, &id))
     };
-    info!(
-        context,
-        "Exporting key {:?} to {}",
-        key.key_id(),
-        file_name.display()
-    );
+    info!(context, "Exporting key {}", file_name.display());
     dc_delete_file(context, &file_name).await;
 
     let content = key.to_asc(None).into_bytes();
@@ -1042,7 +1034,7 @@ mod tests {
     }
 
     #[async_std::test]
-    async fn test_export_public_key_to_asc_file() {
+    async fn test_export_key_to_asc_file() {
         let context = TestContext::new().await;
         let key = alice_keypair().public;
         let blobdir = "$BLOBDIR";
@@ -1056,37 +1048,6 @@ mod tests {
         assert_eq!(bytes, key.to_asc(None).into_bytes());
     }
 
-    #[async_std::test]
-    async fn test_export_private_key_to_asc_file() {
-        let context = TestContext::new().await;
-        let key = alice_keypair().secret;
-        let blobdir = "$BLOBDIR";
-        assert!(export_key_to_asc_file(&context.ctx, blobdir, None, &key)
-            .await
-            .is_ok());
-        let blobdir = context.ctx.get_blobdir().to_str().unwrap();
-        let filename = format!("{}/private-key-default.asc", blobdir);
-        let bytes = async_std::fs::read(&filename).await.unwrap();
-
-        assert_eq!(bytes, key.to_asc(None).into_bytes());
-    }
-
-    #[async_std::test]
-    async fn test_export_and_import_key() {
-        let context = TestContext::new().await;
-        context.configure_alice().await;
-        let blobdir = context.ctx.get_blobdir().to_str().unwrap();
-        if let Err(err) = imex(&context.ctx, ImexMode::ExportSelfKeys, blobdir).await {
-            panic!("got error on export: {:?}", err);
-        }
-
-        let context2 = TestContext::new().await;
-        context2.configure_alice().await;
-        if let Err(err) = imex(&context2.ctx, ImexMode::ImportSelfKeys, blobdir).await {
-            panic!("got error on import: {:?}", err);
-        }
-    }
-
     #[test]
     fn test_normalize_setup_code() {
         let norm = normalize_setup_code("123422343234423452346234723482349234");

src/job.rs

@@ -14,6 +14,7 @@ use async_smtp::smtp::response::Category;
 use async_smtp::smtp::response::Code;
 use async_smtp::smtp::response::Detail;
 
+use crate::blob::BlobObject;
 use crate::chat::{self, ChatId};
 use crate::config::Config;
 use crate::contact::Contact;
@@ -29,7 +30,6 @@ use crate::message::{self, Message, MessageState};
 use crate::mimefactory::MimeFactory;
 use crate::param::*;
 use crate::smtp::Smtp;
-use crate::{blob::BlobObject, contact::normalize_name, contact::Modifier, contact::Origin};
 use crate::{scheduler::InterruptInfo, sql};
 
 // results in ~3 weeks for the last backoff timespan
@@ -92,7 +92,6 @@ pub enum Action {
 
     // Jobs in the INBOX-thread, range from DC_IMAP_THREAD..DC_IMAP_THREAD+999
     Housekeeping = 105, // low priority ...
-    FetchExistingMsgs = 110,
     MarkseenMsgOnImap = 130,
 
     // Moving message is prioritized lower than deletion so we don't
@@ -125,7 +124,6 @@ impl From<Action> for Thread {
             Unknown => Thread::Unknown,
 
             Housekeeping => Thread::Imap,
-            FetchExistingMsgs => Thread::Imap,
             DeleteMsgOnImap => Thread::Imap,
             ResyncFolders => Thread::Imap,
             MarkseenMsgOnImap => Thread::Imap,
@@ -621,43 +619,6 @@ impl Job {
         }
     }
 
-    /// Read the recipients from old emails sent by the user and add them as contacts.
-    /// This way, we can already offer them some email addresses they can write to.
-    ///
-    /// Then, Fetch the last messages DC_FETCH_EXISTING_MSGS_COUNT emails from the server
-    /// and show them in the chat list.
-    async fn fetch_existing_msgs(&mut self, context: &Context, imap: &mut Imap) -> Status {
-        if context.get_config_bool(Config::Bot).await {
-            return Status::Finished(Ok(())); // Bots don't want those messages
-        }
-        if let Err(err) = imap.connect_configured(context).await {
-            warn!(context, "could not connect: {:?}", err);
-            return Status::RetryLater;
-        }
-
-        add_all_recipients_as_contacts(context, imap, Config::ConfiguredSentboxFolder).await;
-        add_all_recipients_as_contacts(context, imap, Config::ConfiguredMvboxFolder).await;
-        add_all_recipients_as_contacts(context, imap, Config::ConfiguredInboxFolder).await;
-
-        if context.get_config_bool(Config::FetchExistingMsgs).await {
-            for config in &[
-                Config::ConfiguredMvboxFolder,
-                Config::ConfiguredInboxFolder,
-                Config::ConfiguredSentboxFolder,
-            ] {
-                if let Some(folder) = context.get_config(*config).await {
-                    if let Err(e) = imap.fetch_new_messages(context, folder, true).await {
-                        // We are using Anyhow's .context() and to show the inner error, too, we need the {:#}:
-                        warn!(context, "Could not fetch messages, retrying: {:#}", e);
-                        return Status::RetryLater;
-                    };
-                }
-            }
-        }
-        info!(context, "Done fetching existing messages.");
-        Status::Finished(Ok(()))
-    }
-
     /// Synchronizes UIDs for sentbox, inbox and mvbox, in this order.
     ///
     /// If a copy of the message is present in multiple folders, mvbox
@@ -798,50 +759,6 @@ async fn set_delivered(context: &Context, msg_id: MsgId) {
     context.emit_event(EventType::MsgDelivered { chat_id, msg_id });
 }
 
-async fn add_all_recipients_as_contacts(context: &Context, imap: &mut Imap, folder: Config) {
-    let mailbox = if let Some(m) = context.get_config(folder).await {
-        m
-    } else {
-        return;
-    };
-    if let Err(e) = imap.select_with_uidvalidity(context, &mailbox).await {
-        warn!(context, "Could not select {}: {}", mailbox, e);
-        return;
-    }
-    match imap.get_all_recipients(context).await {
-        Ok(contacts) => {
-            let mut any_modified = false;
-            for contact in contacts {
-                let display_name_normalized = contact
-                    .display_name
-                    .as_ref()
-                    .map(normalize_name)
-                    .unwrap_or_default();
-
-                match Contact::add_or_lookup(
-                    context,
-                    display_name_normalized,
-                    contact.addr,
-                    Origin::OutgoingTo,
-                )
-                .await
-                {
-                    Ok((_, modified)) => {
-                        if modified != Modifier::None {
-                            any_modified = true;
-                        }
-                    }
-                    Err(e) => warn!(context, "Could not add recipient: {}", e),
-                }
-            }
-            if any_modified {
-                context.emit_event(EventType::ContactsChanged(None));
-            }
-        }
-        Err(e) => warn!(context, "Could not add recipients: {}", e),
-    };
-}
-
 /// Constructs a job for sending a message.
 ///
 /// Returns `None` if no messages need to be sent out.
@@ -1090,7 +1007,6 @@ async fn perform_job_action(
         Action::ResyncFolders => job.resync_folders(context, connection.inbox()).await,
         Action::MarkseenMsgOnImap => job.markseen_msg_on_imap(context, connection.inbox()).await,
         Action::MoveMsg => job.move_msg(context, connection.inbox()).await,
-        Action::FetchExistingMsgs => job.fetch_existing_msgs(context, connection.inbox()).await,
         Action::Housekeeping => {
             sql::housekeeping(context).await;
             Status::Finished(Ok(()))
@@ -1156,7 +1072,6 @@ pub async fn add(context: &Context, job: Job) {
             | Action::DeleteMsgOnImap
             | Action::ResyncFolders
             | Action::MarkseenMsgOnImap
-            | Action::FetchExistingMsgs
             | Action::MoveMsg => {
                 info!(context, "interrupt: imap");
                 context

src/key.rs

@@ -222,7 +222,7 @@ async fn generate_keypair(context: &Context) -> Result<KeyPair> {
     let addr = context
         .get_config(Config::ConfiguredAddr)
         .await
-        .ok_or(Error::NoConfiguredAddr)?;
+        .ok_or_else(|| Error::NoConfiguredAddr)?;
     let addr = EmailAddress::new(&addr)?;
     let _guard = context.generating_key_mutex.lock().await;
 
@@ -431,9 +431,11 @@ mod tests {
     use std::error::Error;
 
     use async_std::sync::Arc;
-    use once_cell::sync::Lazy;
+    use lazy_static::lazy_static;
 
-    static KEYPAIR: Lazy<KeyPair> = Lazy::new(alice_keypair);
+    lazy_static! {
+        static ref KEYPAIR: KeyPair = alice_keypair();
+    }
 
     #[test]
     fn test_from_armored_string() {

src/message.rs

@@ -2,7 +2,7 @@
 
 use async_std::path::{Path, PathBuf};
 use deltachat_derive::{FromSql, ToSql};
-use itertools::Itertools;
+use lazy_static::lazy_static;
 use serde::{Deserialize, Serialize};
 
 use crate::chat::{self, Chat, ChatId};
@@ -19,7 +19,10 @@ use crate::mimeparser::{FailureReport, SystemMessage};
 use crate::param::*;
 use crate::pgp::*;
 use crate::stock::StockMessage;
-use std::collections::BTreeMap;
+
+lazy_static! {
+    static ref UNWRAP_RE: regex::Regex = regex::Regex::new(r"\s+").unwrap();
+}
 
 // In practice, the user additionally cuts the string themselves
 // pixel-accurate.
@@ -263,9 +266,10 @@ pub struct Message {
     pub(crate) server_folder: Option<String>,
     pub(crate) server_uid: u32,
     pub(crate) is_dc_message: MessengerMessage,
+    pub(crate) starred: bool,
     pub(crate) chat_blocked: Blocked,
     pub(crate) location_id: u32,
-    error: Option<String>,
+    pub(crate) error: String,
     pub(crate) param: Params,
 }
 
@@ -306,6 +310,7 @@ impl Message {
                     "    m.msgrmsg AS msgrmsg,",
                     "    m.txt AS txt,",
                     "    m.param AS param,",
+                    "    m.starred AS starred,",
                     "    m.hidden AS hidden,",
                     "    m.location_id AS location,",
                     "    c.blocked AS blocked",
@@ -331,8 +336,7 @@ impl Message {
                     msg.ephemeral_timestamp = row.get("ephemeral_timestamp")?;
                     msg.viewtype = row.get("type")?;
                     msg.state = row.get("state")?;
-                    let error: String = row.get("error")?;
-                    msg.error = Some(error).filter(|error| !error.is_empty());
+                    msg.error = row.get("error")?;
                     msg.is_dc_message = row.get("msgrmsg")?;
 
                     let text;
@@ -356,6 +360,7 @@ impl Message {
                     msg.text = Some(text);
 
                     msg.param = row.get::<_, String>("param")?.parse().unwrap_or_default();
+                    msg.starred = row.get("starred")?;
                     msg.hidden = row.get("hidden")?;
                     msg.location_id = row.get("location")?;
                     msg.chat_blocked = row
@@ -544,7 +549,9 @@ impl Message {
             return ret;
         };
 
-        let contact = if self.from_id != DC_CONTACT_ID_SELF as u32 && chat.typ == Chattype::Group {
+        let contact = if self.from_id != DC_CONTACT_ID_SELF as u32
+            && (chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup)
+        {
             Contact::get_by_id(context, self.from_id).await.ok()
         } else {
             None
@@ -578,6 +585,10 @@ impl Message {
         self.state as i32 >= MessageState::OutDelivered as i32
     }
 
+    pub fn is_starred(&self) -> bool {
+        self.starred
+    }
+
     pub fn is_forwarded(&self) -> bool {
         0 != self.param.get_int(Param::Forwarded).unwrap_or_default()
     }
@@ -589,10 +600,6 @@ impl Message {
             || cmd != SystemMessage::Unknown && cmd != SystemMessage::AutocryptSetupMessage
     }
 
-    pub fn get_info_type(&self) -> SystemMessage {
-        self.param.get_cmd()
-    }
-
     pub fn is_system_message(&self) -> bool {
         let cmd = self.param.get_cmd();
         cmd != SystemMessage::Unknown
@@ -743,61 +750,6 @@ impl Message {
         self.update_param(context).await;
     }
 
-    /// Sets message quote.
-    ///
-    /// Message-Id is used to set Reply-To field, message text is used for quote.
-    ///
-    /// Encryption is required if quoted message was encrypted.
-    ///
-    /// The message itself is not required to exist in the database,
-    /// it may even be deleted from the database by the time the message is prepared.
-    pub async fn set_quote(&mut self, context: &Context, quote: &Message) -> Result<(), Error> {
-        ensure!(
-            !quote.rfc724_mid.is_empty(),
-            "Message without Message-Id cannot be quoted"
-        );
-        self.in_reply_to = Some(quote.rfc724_mid.clone());
-
-        if quote
-            .param
-            .get_bool(Param::GuaranteeE2ee)
-            .unwrap_or_default()
-        {
-            self.param.set(Param::GuaranteeE2ee, "1");
-        }
-
-        let text = quote.get_text().unwrap_or_default();
-        self.param.set(
-            Param::Quote,
-            if text.is_empty() {
-                // Use summary, similar to "Image" to avoid sending empty quote.
-                quote.get_summarytext(context, 500).await
-            } else {
-                text
-            },
-        );
-
-        Ok(())
-    }
-
-    pub fn quoted_text(&self) -> Option<String> {
-        self.param.get(Param::Quote).map(|s| s.to_string())
-    }
-
-    pub async fn quoted_message(&self, context: &Context) -> Result<Option<Message>, Error> {
-        if self.param.get(Param::Quote).is_some() {
-            if let Some(in_reply_to) = &self.in_reply_to {
-                let rfc724_mid = in_reply_to.trim_start_matches('<').trim_end_matches('>');
-                if !rfc724_mid.is_empty() {
-                    if let Some((_, _, msg_id)) = rfc724_mid_exists(context, rfc724_mid).await? {
-                        return Ok(Some(Message::load_from_db(context, msg_id).await?));
-                    }
-                }
-            }
-        }
-        Ok(None)
-    }
-
     pub async fn update_param(&mut self, context: &Context) -> bool {
         context
             .sql
@@ -808,22 +760,6 @@ impl Message {
             .await
             .is_ok()
     }
-
-    /// Gets the error status of the message.
-    ///
-    /// A message can have an associated error status if something went wrong when sending or
-    /// receiving message itself.  The error status is free-form text and should not be further parsed,
-    /// rather it's presence is meant to indicate *something* went wrong with the message and the
-    /// text of the error is detailed information on what.
-    ///
-    /// Some common reasons error can be associated with messages are:
-    /// * Lack of valid signature on an e2ee message, usually for received messages.
-    /// * Failure to decrypt an e2ee message, usually for received messages.
-    /// * When a message could not be delivered to one or more recipients the non-delivery
-    ///    notification text can be stored in the error status.
-    pub fn error(&self) -> Option<String> {
-        self.error.clone()
-    }
 }
 
 #[derive(
@@ -930,18 +866,13 @@ impl From<MessageState> for LotState {
 
 impl MessageState {
     pub fn can_fail(self) -> bool {
-        use MessageState::*;
-        matches!(
-            self,
-            OutPreparing | OutPending | OutDelivered | OutMdnRcvd // OutMdnRcvd can still fail because it could be a group message and only some recipients failed.
-        )
-    }
-    pub fn is_outgoing(self) -> bool {
-        use MessageState::*;
-        matches!(
-            self,
-            OutPreparing | OutDraft | OutPending | OutFailed | OutDelivered | OutMdnRcvd
-        )
+        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.
+            _ => false,
+        }
     }
 }
 
@@ -978,7 +909,7 @@ impl Lot {
                 );
                 self.text1_meaning = Meaning::Text1Self;
             }
-        } else if chat.typ == Chattype::Group {
+        } else if chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup {
             if msg.is_info() || contact.is_none() {
                 self.text1 = None;
                 self.text1_meaning = Meaning::None;
@@ -998,23 +929,16 @@ impl Lot {
             }
         }
 
-        let mut text2 = get_summarytext_by_raw(
-            msg.viewtype,
-            msg.text.as_ref(),
-            &msg.param,
-            SUMMARY_CHARACTERS,
-            context,
-        )
-        .await;
-
-        if text2.is_empty() && msg.quoted_text().is_some() {
-            text2 = context
-                .stock_str(StockMessage::ReplyNoun)
-                .await
-                .into_owned()
-        }
-
-        self.text2 = Some(text2);
+        self.text2 = Some(
+            get_summarytext_by_raw(
+                msg.viewtype,
+                msg.text.as_ref(),
+                &msg.param,
+                SUMMARY_CHARACTERS,
+                context,
+            )
+            .await,
+        );
 
         self.timestamp = msg.get_timestamp();
         self.state = msg.state.into();
@@ -1130,8 +1054,8 @@ pub async fn get_msg_info(context: &Context, msg_id: MsgId) -> String {
 
     ret += "\n";
 
-    if let Some(error) = msg.error.as_ref() {
-        ret += &format!("Error: {}", error);
+    if !msg.error.is_empty() {
+        ret += &format!("Error: {}", msg.error);
     }
 
     if let Some(path) = msg.get_file(context) {
@@ -1196,7 +1120,6 @@ pub fn guess_msgtype_from_suffix(path: &Path) -> Option<(Viewtype, &str)> {
         "jpg" => (Viewtype::Image, "image/jpeg"),
         "json" => (Viewtype::File, "application/json"),
         "mov" => (Viewtype::Video, "video/quicktime"),
-        "m4a" => (Viewtype::Audio, "audio/m4a"),
         "mp3" => (Viewtype::Audio, "audio/mpeg"),
         "mp4" => (Viewtype::Video, "video/mp4"),
         "odp" => (
@@ -1307,7 +1230,6 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> bool {
         .with_conn(move |conn| {
             let mut stmt = conn.prepare_cached(concat!(
                 "SELECT",
-                "    m.chat_id AS chat_id,",
                 "    m.state AS state,",
                 "    c.blocked AS blocked",
                 " FROM msgs m LEFT JOIN chats c ON c.id=m.chat_id",
@@ -1318,7 +1240,6 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> bool {
             for id in msg_ids.into_iter() {
                 let query_res = stmt.query_row(paramsv![id], |row| {
                     Ok((
-                        row.get::<_, ChatId>("chat_id")?,
                         row.get::<_, MessageState>("state")?,
                         row.get::<_, Option<Blocked>>("blocked")?
                             .unwrap_or_default(),
@@ -1327,8 +1248,8 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> bool {
                 if let Err(rusqlite::Error::QueryReturnedNoRows) = query_res {
                     continue;
                 }
-                let (chat_id, state, blocked) = query_res.map_err(Into::<anyhow::Error>::into)?;
-                msgs.push((id, chat_id, state, blocked));
+                let (state, blocked) = query_res.map_err(Into::<anyhow::Error>::into)?;
+                msgs.push((id, state, blocked));
             }
 
             Ok(msgs)
@@ -1336,9 +1257,9 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> bool {
         .await
         .unwrap_or_default();
 
-    let mut updated_chat_ids = BTreeMap::new();
+    let mut send_event = false;
 
-    for (id, curr_chat_id, curr_state, curr_blocked) in msgs.into_iter() {
+    for (id, curr_state, curr_blocked) in msgs.into_iter() {
         if let Err(err) = id.start_ephemeral_timer(context).await {
             error!(
                 context,
@@ -1357,16 +1278,19 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> bool {
                     job::Job::new(Action::MarkseenMsgOnImap, id.to_u32(), Params::new(), 0),
                 )
                 .await;
-                updated_chat_ids.insert(curr_chat_id, true);
+                send_event = true;
             }
         } else if curr_state == MessageState::InFresh {
             update_msg_state(context, id, MessageState::InNoticed).await;
-            updated_chat_ids.insert(ChatId::new(DC_CHAT_ID_DEADDROP), true);
+            send_event = true;
         }
     }
 
-    for updated_chat_id in updated_chat_ids.keys() {
-        context.emit_event(EventType::MsgsNoticed(*updated_chat_id));
+    if send_event {
+        context.emit_event(EventType::MsgsChanged {
+            chat_id: ChatId::new(0),
+            msg_id: MsgId::new(0),
+        });
     }
 
     true
@@ -1383,6 +1307,23 @@ pub async fn update_msg_state(context: &Context, msg_id: MsgId, state: MessageSt
         .is_ok()
 }
 
+pub async fn star_msgs(context: &Context, msg_ids: Vec<MsgId>, star: bool) -> bool {
+    if msg_ids.is_empty() {
+        return false;
+    }
+    context
+        .sql
+        .with_conn(move |conn| {
+            let mut stmt = conn.prepare("UPDATE msgs SET starred=? WHERE id=?;")?;
+            for msg_id in msg_ids.into_iter() {
+                stmt.execute(paramsv![star as i32, msg_id])?;
+            }
+            Ok(())
+        })
+        .await
+        .is_ok()
+}
+
 /// Returns a summary text.
 pub async fn get_summarytext_by_raw(
     viewtype: Viewtype,
@@ -1461,7 +1402,7 @@ pub async fn get_summarytext_by_raw(
         prefix
     };
 
-    summary.split_whitespace().join(" ")
+    UNWRAP_RE.replace_all(&summary, " ").to_string()
 }
 
 // as we do not cut inside words, this results in about 32-42 characters.
@@ -1638,16 +1579,14 @@ pub(crate) async fn handle_ndn(
     context: &Context,
     failed: &FailureReport,
     error: Option<impl AsRef<str>>,
-) -> anyhow::Result<()> {
+) {
     if failed.rfc724_mid.is_empty() {
-        return Ok(());
+        return;
     }
 
-    // The NDN might be for a message-id that had attachments and was sent from a non-Delta Chat client.
-    // In this case we need to mark multiple "msgids" as failed that all refer to the same message-id.
-    let msgs: Vec<_> = context
+    let res = context
         .sql
-        .query_map(
+        .query_row(
             concat!(
                 "SELECT",
                 "    m.id AS msg_id,",
@@ -1664,42 +1603,37 @@ pub(crate) async fn handle_ndn(
                     row.get::<_, Chattype>("type")?,
                 ))
             },
-            |rows| Ok(rows.collect::<Vec<_>>()),
         )
-        .await?;
-
-    for (i, msg) in msgs.into_iter().enumerate() {
-        let (msg_id, chat_id, chat_type) = msg?;
-        set_msg_failed(context, msg_id, error.as_ref()).await;
-        if i == 0 {
-            // Add only one info msg for all failed messages
-            ndn_maybe_add_info_msg(context, failed, chat_id, chat_type).await?;
-        }
+        .await;
+    if let Err(ref err) = res {
+        info!(context, "Failed to select NDN {:?}", err);
     }
 
-    Ok(())
-}
+    if let Ok((msg_id, chat_id, chat_type)) = res {
+        set_msg_failed(context, msg_id, error).await;
 
-async fn ndn_maybe_add_info_msg(
-    context: &Context,
-    failed: &FailureReport,
-    chat_id: ChatId,
-    chat_type: Chattype,
-) -> anyhow::Result<()> {
-    if chat_type == Chattype::Group {
-        if let Some(failed_recipient) = &failed.failed_recipient {
-            let contact_id =
-                Contact::lookup_id_by_addr(context, failed_recipient, Origin::Unknown).await;
-            let 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)
-            let text = context
-                .stock_string_repl_str(StockMessage::FailedSendingTo, contact.get_display_name())
-                .await;
-            chat::add_info_msg(context, chat_id, text).await;
-            context.emit_event(EventType::ChatModified(chat_id));
+        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(EventType::ChatModified(chat_id));
+                }
+            }
         }
     }
-    Ok(())
 }
 
 /// The number of messages assigned to real chat (!=deaddrop, !=trash)
@@ -1903,29 +1837,12 @@ mod tests {
         assert_eq!(_msg2.get_filemime(), None);
     }
 
-    /// Tests that message cannot be prepared if account has no configured address.
-    #[async_std::test]
-    async fn test_prepare_not_configured() {
-        let d = test::TestContext::new().await;
-        let ctx = &d.ctx;
-
-        let contact = Contact::create(ctx, "", "dest@example.com")
-            .await
-            .expect("failed to create contact");
-
-        let chat = chat::create_by_contact_id(ctx, contact).await.unwrap();
-
-        let mut msg = Message::new(Viewtype::Text);
-
-        assert!(chat::prepare_msg(ctx, chat, &mut msg).await.is_err());
-    }
-
     #[async_std::test]
     async fn test_get_summarytext_by_raw() {
         let d = test::TestContext::new().await;
         let ctx = &d.ctx;
 
-        let some_text = Some(" bla \t\n\tbla\n\t".to_string());
+        let some_text = Some("bla bla".to_string());
         let empty_text = Some("".to_string());
         let no_text: Option<String> = None;
 
@@ -2091,43 +2008,4 @@ mod tests {
         }
         assert!(has_image);
     }
-
-    #[async_std::test]
-    async fn test_quote() {
-        use crate::config::Config;
-
-        let d = test::TestContext::new().await;
-        let ctx = &d.ctx;
-
-        let contact = Contact::create(ctx, "", "dest@example.com")
-            .await
-            .expect("failed to create contact");
-
-        let res = ctx
-            .set_config(Config::ConfiguredAddr, Some("self@example.com"))
-            .await;
-        assert!(res.is_ok());
-
-        let chat = chat::create_by_contact_id(ctx, contact).await.unwrap();
-
-        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text(Some("Quoted message".to_string()));
-
-        // Prepare message for sending, so it gets a Message-Id.
-        assert!(msg.rfc724_mid.is_empty());
-        let msg_id = chat::prepare_msg(ctx, chat, &mut msg).await.unwrap();
-        let msg = Message::load_from_db(ctx, msg_id).await.unwrap();
-        assert!(!msg.rfc724_mid.is_empty());
-
-        let mut msg2 = Message::new(Viewtype::Text);
-        msg2.set_quote(ctx, &msg).await.expect("can't set quote");
-        assert!(msg2.quoted_text() == msg.get_text());
-
-        let quoted_msg = msg2
-            .quoted_message(ctx)
-            .await
-            .expect("error while retrieving quoted message")
-            .expect("quoted message not found");
-        assert!(quoted_msg.get_text() == msg2.quoted_text());
-    }
 }

src/mimefactory.rs

@@ -1,9 +1,5 @@
 use chrono::TimeZone;
 use lettre_email::{mime, Address, Header, MimeMultipartType, PartBuilder};
-use std::collections::HashSet;
-use vcard::properties::Photo;
-use vcard::values::image_value::ImageValue;
-use vcard::{Set, VCard};
 
 use crate::blob::BlobObject;
 use crate::chat::{self, Chat};
@@ -15,7 +11,7 @@ use crate::dc_tools::*;
 use crate::e2ee::*;
 use crate::ephemeral::Timer as EphemeralTimer;
 use crate::error::{bail, ensure, format_err, Error};
-use crate::format_flowed::{format_flowed, format_flowed_quote};
+use crate::format_flowed::format_flowed;
 use crate::location;
 use crate::message::{self, Message};
 use crate::mimeparser::SystemMessage;
@@ -149,7 +145,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
             selfstatus: context
                 .get_config(Config::Selfstatus)
                 .await
-                .unwrap_or(default_str),
+                .unwrap_or_else(|| default_str),
             recipients,
             timestamp: msg.timestamp_sort,
             loaded: Loaded::Message { chat },
@@ -187,7 +183,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
         let selfstatus = context
             .get_config(Config::Selfstatus)
             .await
-            .unwrap_or(default_str);
+            .unwrap_or_else(|| default_str);
         let timestamp = dc_create_smeared_timestamp(context).await;
 
         let res = MimeFactory::<'a, 'b> {
@@ -237,7 +233,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
     fn is_e2ee_guaranteed(&self) -> bool {
         match &self.loaded {
             Loaded::Message { chat } => {
-                if chat.is_protected() {
+                if chat.typ == Chattype::VerifiedGroup {
                     return true;
                 }
 
@@ -259,7 +255,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
     fn min_verified(&self) -> PeerstateVerifiedStatus {
         match &self.loaded {
             Loaded::Message { chat } => {
-                if chat.is_protected() {
+                if chat.typ == Chattype::VerifiedGroup {
                     PeerstateVerifiedStatus::BidirectVerified
                 } else {
                     PeerstateVerifiedStatus::Unverified
@@ -272,7 +268,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
     fn should_force_plaintext(&self) -> bool {
         match &self.loaded {
             Loaded::Message { chat } => {
-                if chat.is_protected() {
+                if chat.typ == Chattype::VerifiedGroup {
                     false
                 } else {
                     self.msg
@@ -349,7 +345,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
                         .stock_str(StockMessage::AcSetupMsgSubject)
                         .await
                         .into_owned()
-                } else if chat.typ == Chattype::Group {
+                } else if chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup {
                     let re = if self.in_reply_to.is_empty() {
                         ""
                     } else {
@@ -712,11 +708,11 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
         let mut placeholdertext = None;
         let mut meta_part = None;
 
-        if chat.is_protected() {
+        if chat.typ == Chattype::VerifiedGroup {
             protected_headers.push(Header::new("Chat-Verified".to_string(), "1".to_string()));
         }
 
-        if chat.typ == Chattype::Group {
+        if chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup {
             protected_headers.push(Header::new("Chat-Group-ID".into(), chat.grpid.clone()));
 
             let encoded = encode_words(&chat.name);
@@ -850,18 +846,6 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
                     };
                 }
             }
-            SystemMessage::ChatProtectionEnabled => {
-                protected_headers.push(Header::new(
-                    "Chat-Content".to_string(),
-                    "protection-enabled".to_string(),
-                ));
-            }
-            SystemMessage::ChatProtectionDisabled => {
-                protected_headers.push(Header::new(
-                    "Chat-Content".to_string(),
-                    "protection-disabled".to_string(),
-                ));
-            }
             _ => {}
         }
 
@@ -933,17 +917,12 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
             }
         };
 
-        let quoted_text = self
-            .msg
-            .quoted_text()
-            .map(|quote| format_flowed_quote(&quote) + "\r\n\r\n");
         let flowed_text = format_flowed(final_text);
 
         let footer = &self.selfstatus;
         let message_text = format!(
-            "{}{}{}{}{}{}",
+            "{}{}{}{}{}",
             fwdhint.unwrap_or_default(),
-            quoted_text.unwrap_or_default(),
             escape_message_footer_marks(&flowed_text),
             if !final_text.is_empty() && !footer.is_empty() {
                 "\r\n\r\n"
@@ -995,24 +974,13 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
 
         if self.attach_selfavatar {
             match context.get_config(Config::Selfavatar).await {
-                Some(path) => {
-                    match build_selfavatar_file(context, &path) {
-                        Ok((part, filename)) => {
-                            parts.push(part);
-                            protected_headers.push(Header::new("Chat-User-Avatar".into(), filename))
-                        }
-                        Err(err) => {
-                            warn!(context, "mimefactory: cannot attach selfavatar: {}", err)
-                        }
-                    };
-
-                    match build_vcard_part(context, &path).await {
-                        Ok(part) => {
-                            parts.push(part);
-                        }
-                        Err(err) => warn!(context, "mimefactory: cannot build vCard: {}", err),
-                    };
-                }
+                Some(path) => match build_selfavatar_file(context, &path) {
+                    Ok((part, filename)) => {
+                        parts.push(part);
+                        protected_headers.push(Header::new("Chat-User-Avatar".into(), filename))
+                    }
+                    Err(err) => warn!(context, "mimefactory: cannot attach selfavatar: {}", err),
+                },
                 None => protected_headers.push(Header::new("Chat-User-Avatar".into(), "0".into())),
             }
         }
@@ -1156,23 +1124,13 @@ async fn build_body_file(
         Viewtype::Image | Viewtype::Gif => format!(
             "{}.{}",
             if base_name.is_empty() {
-                chrono::Utc
-                    .timestamp(msg.timestamp_sort as i64, 0)
-                    .format("image_%Y-%m-%d_%H-%M-%S")
-                    .to_string()
+                "image"
             } else {
-                base_name.to_string()
+                base_name
             },
             &suffix,
         ),
-        Viewtype::Video => format!(
-            "video_{}.{}",
-            chrono::Utc
-                .timestamp(msg.timestamp_sort as i64, 0)
-                .format("%Y-%m-%d_%H-%M-%S")
-                .to_string(),
-            &suffix
-        ),
+        Viewtype::Video => format!("video.{}", &suffix),
         _ => blob.as_file_name().to_string(),
     };
 
@@ -1214,40 +1172,6 @@ async fn build_body_file(
     Ok((mail, filename_to_send))
 }
 
-async fn build_vcard_file(context: &Context, avatar_path: &str) -> Result<String, Error> {
-    let avatar_blob = BlobObject::from_path(context, avatar_path)?;
-
-    let displayname = context
-        .get_config(Config::Displayname)
-        .await
-        .unwrap_or_default();
-    let mut vcard = VCard::from_formatted_name_str(&displayname)?;
-    // TODO: add KIND:individual
-    let mut photos = HashSet::new();
-    if let Ok(image_value) = ImageValue::from_file(avatar_blob.to_abs_path()) {
-        let photo = Photo::from_image_value(image_value);
-        photos.insert(photo);
-    }
-    vcard.photos = Set::from_hash_set(photos).ok();
-    Ok(vcard.to_string())
-}
-
-async fn build_vcard_part(context: &Context, avatar_path: &str) -> Result<PartBuilder, Error> {
-    let body = build_vcard_file(context, avatar_path).await?;
-    let encoded_body = wrapped_base64_encode(&body.as_bytes());
-
-    let part = PartBuilder::new()
-        .content_type(&mime::TEXT_VCARD)
-        .header((
-            "Content-Disposition",
-            "attachment; filename=\"{avatar.vcf}\"",
-        ))
-        .header(("Content-Transfer-Encoding", "base64"))
-        .body(encoded_body);
-
-    Ok(part)
-}
-
 fn build_selfavatar_file(context: &Context, path: &str) -> Result<(PartBuilder, String), Error> {
     let blob = BlobObject::from_path(context, path)?;
     let filename_to_send = match blob.suffix() {

src/mimeparser.rs

@@ -3,9 +3,9 @@ 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};
-use once_cell::sync::Lazy;
 
 use crate::aheader::Aheader;
 use crate::blob::BlobObject;
@@ -86,10 +86,6 @@ pub enum SystemMessage {
 
     /// Chat ephemeral message timer is changed.
     EphemeralTimerChanged = 10,
-
-    // Chat protection state changed
-    ChatProtectionEnabled = 11,
-    ChatProtectionDisabled = 12,
 }
 
 impl Default for SystemMessage {
@@ -127,7 +123,6 @@ impl MimeMessage {
 
         // remove headers that are allowed _only_ in the encrypted part
         headers.remove("secure-join-fingerprint");
-        headers.remove("chat-verified");
 
         // Memory location for a possible decrypted message.
         let mail_raw;
@@ -223,13 +218,12 @@ impl MimeMessage {
             failure_report: None,
         };
         parser.parse_mime_recursive(context, &mail).await?;
-        parser.maybe_remove_bad_parts().await;
         parser.heuristically_parse_ndn(context).await;
         parser.parse_headers(context)?;
 
         if warn_empty_signature && parser.signatures.is_empty() {
             for part in parser.parts.iter_mut() {
-                part.error = Some("No valid signature".to_string());
+                part.error = "No valid signature".to_string();
             }
         }
 
@@ -259,10 +253,6 @@ impl MimeMessage {
                 self.is_system_message = SystemMessage::LocationStreamingEnabled;
             } else if value == "ephemeral-timer-changed" {
                 self.is_system_message = SystemMessage::EphemeralTimerChanged;
-            } else if value == "protection-enabled" {
-                self.is_system_message = SystemMessage::ChatProtectionEnabled;
-            } else if value == "protection-disabled" {
-                self.is_system_message = SystemMessage::ChatProtectionDisabled;
             }
         }
         Ok(())
@@ -295,8 +285,7 @@ impl MimeMessage {
     /// Squashes mutlipart chat messages with attachment into single-part messages.
     ///
     /// Delta Chat sends attachments, such as images, in two-part messages, with the first message
-    /// containing a description. If such a message is detected, text from the first part can be
-    /// moved to the second part, and the first part dropped.
+    /// containing an explanation. If such a message is detected, first part can be safely dropped.
     #[allow(clippy::indexing_slicing)]
     fn squash_attachment_parts(&mut self) {
         if let [textpart, filepart] = &self.parts[..] {
@@ -316,9 +305,6 @@ impl MimeMessage {
 
                 // insert new one
                 filepart.msg = self.parts[0].msg.clone();
-                if let Some(quote) = self.parts[0].param.get(Param::Quote) {
-                    filepart.param.set(Param::Quote, quote);
-                }
 
                 // forget the one we use now
                 self.parts[0].msg = "".to_string();
@@ -603,7 +589,7 @@ impl MimeMessage {
                 part.typ = Viewtype::Text;
                 part.msg_raw = Some(txt.clone());
                 part.msg = txt;
-                part.error = Some("Decryption failed".to_string());
+                part.error = "Decryption failed".to_string();
 
                 self.parts.push(part);
 
@@ -718,17 +704,12 @@ impl MimeMessage {
                             }
                         };
 
-                        let mut dehtml_failed = false;
-
-                        let (simplified_txt, is_forwarded, top_quote) = if decoded_data.is_empty() {
-                            ("".to_string(), false, None)
+                        let (simplified_txt, is_forwarded) = if decoded_data.is_empty() {
+                            ("".into(), false)
                         } else {
                             let is_html = mime_type == mime::TEXT_HTML;
                             let out = if is_html {
-                                dehtml(&decoded_data).unwrap_or_else(|| {
-                                    dehtml_failed = true;
-                                    decoded_data.clone()
-                                })
+                                dehtml(&decoded_data)
                             } else {
                                 decoded_data.clone()
                             };
@@ -742,7 +723,7 @@ impl MimeMessage {
                             false
                         };
 
-                        let (simplified_txt, simplified_quote) = if mime_type.type_() == mime::TEXT
+                        let simplified_txt = if mime_type.type_() == mime::TEXT
                             && mime_type.subtype() == mime::PLAIN
                             && is_format_flowed
                         {
@@ -751,22 +732,16 @@ impl MimeMessage {
                             } else {
                                 false
                             };
-                            let unflowed_text = unformat_flowed(&simplified_txt, delsp);
-                            let unflowed_quote = top_quote.map(|q| unformat_flowed(&q, delsp));
-                            (unflowed_text, unflowed_quote)
+                            unformat_flowed(&simplified_txt, delsp)
                         } else {
-                            (simplified_txt, top_quote)
+                            simplified_txt
                         };
 
-                        if !simplified_txt.is_empty() || simplified_quote.is_some() {
+                        if !simplified_txt.is_empty() {
                             let mut part = Part::default();
-                            part.dehtlm_failed = dehtml_failed;
                             part.typ = Viewtype::Text;
                             part.mimetype = Some(mime_type);
                             part.msg = simplified_txt;
-                            if let Some(quote) = simplified_quote {
-                                part.param.set(Param::Quote, quote);
-                            }
                             part.msg_raw = Some(decoded_data);
                             self.do_add_single_part(part);
                         }
@@ -814,26 +789,6 @@ impl MimeMessage {
                 return;
             }
         }
-
-        if mime_type.type_() == "text/x-vcard"
-            || mime_type.type_() == "text/vcard"
-            || filename.ends_with(".vcf")
-            || filename.ends_with(".vcard")
-        {
-            println!("Parsing vcard {:?}", String::from_utf8_lossy(decoded_data));
-            for contact in ical::VcardParser::new(decoded_data) {
-                println!("Parsing contact {:?}", contact);
-                if let Ok(contact) = contact {
-                    for property in contact.properties {
-                        println!("Parsed property {:?}", property);
-                        if property.name == "email" {
-                        }
-                    }
-                }
-            }
-            return;
-        }
-
         /* we have a regular file attachment,
         write decoded data to new blob object */
 
@@ -888,7 +843,6 @@ impl MimeMessage {
     }
 
     pub fn repl_msg_by_error(&mut self, error_msg: impl AsRef<str>) {
-        self.is_system_message = SystemMessage::Unknown;
         if let Some(part) = self.parts.first_mut() {
             part.typ = Viewtype::Text;
             part.msg = format!("[{}]", error_msg.as_ref());
@@ -1023,21 +977,11 @@ impl MimeMessage {
         Ok(None)
     }
 
-    async fn maybe_remove_bad_parts(&mut self) {
-        let good_parts = self.parts.iter().filter(|p| !p.dehtlm_failed).count();
-        if good_parts == 0 {
-            // We have no good part but show at least one bad part in order to show anything at all
-            self.parts.truncate(1);
-        } else if good_parts < self.parts.len() {
-            self.parts.retain(|p| !p.dehtlm_failed);
-        }
-    }
-
     /// 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).
     #[allow(clippy::indexing_slicing)]
-    async fn heuristically_parse_ndn(&mut self, context: &Context) {
+    async fn heuristically_parse_ndn(&mut self, context: &Context) -> Option<()> {
         let maybe_ndn = if let Some(from) = self.get(HeaderDef::From_) {
             let from = from.to_ascii_lowercase();
             from.contains("mailer-daemon") || from.contains("mail-daemon")
@@ -1045,8 +989,9 @@ impl MimeMessage {
             false
         };
         if maybe_ndn && self.failure_report.is_none() {
-            static RE: Lazy<regex::Regex> =
-                Lazy::new(|| regex::Regex::new(r"Message-ID:(.*)").unwrap());
+            lazy_static! {
+                static ref RE: regex::Regex = regex::Regex::new(r"Message-ID:(.*)").unwrap();
+            }
             for captures in self
                 .parts
                 .iter()
@@ -1066,6 +1011,7 @@ impl MimeMessage {
                 }
             }
         }
+        None // Always return None, we just return anything so that we can use the '?' operator.
     }
 
     /// Handle reports
@@ -1095,9 +1041,7 @@ impl MimeMessage {
                 .iter()
                 .find(|p| p.typ == Viewtype::Text)
                 .map(|p| p.msg.clone());
-            if let Err(e) = message::handle_ndn(context, failure_report, error).await {
-                warn!(context, "Could not handle ndn: {}", e);
-            }
+            message::handle_ndn(context, failure_report, error).await
         }
     }
 
@@ -1209,21 +1153,11 @@ pub(crate) fn parse_message_id(ids: &str) -> Result<String> {
 }
 
 fn is_known(key: &str) -> bool {
-    matches!(
-        key,
-        "return-path"
-            | "date"
-            | "from"
-            | "sender"
-            | "reply-to"
-            | "to"
-            | "cc"
-            | "bcc"
-            | "message-id"
-            | "in-reply-to"
-            | "references"
-            | "subject"
-    )
+    match key {
+        "return-path" | "date" | "from" | "sender" | "reply-to" | "to" | "cc" | "bcc"
+        | "message-id" | "in-reply-to" | "references" | "subject" => true,
+        _ => false,
+    }
 }
 
 #[derive(Debug, Default, Clone)]
@@ -1235,8 +1169,7 @@ pub struct Part {
     pub bytes: usize,
     pub param: Params,
     org_filename: Option<String>,
-    pub error: Option<String>,
-    dehtlm_failed: bool,
+    pub error: String,
 }
 
 /// return mimetype and viewtype for a parsed mail
@@ -1338,9 +1271,9 @@ fn get_attachment_filename(mail: &mailparse::ParsedMail) -> Result<Option<String
 }
 
 /// Returned addresses are normalized and lowercased.
-pub(crate) fn get_recipients(headers: &[MailHeader]) -> Vec<SingleInfo> {
+fn get_recipients(headers: &[MailHeader]) -> Vec<SingleInfo> {
     get_all_addresses_from_header(headers, |header_key| {
-        header_key == "to" || header_key == "cc" || header_key == "bcc"
+        header_key == "to" || header_key == "cc"
     })
 }
 
@@ -1652,22 +1585,6 @@ mod tests {
         assert_eq!(mimeparser.group_avatar, None);
     }
 
-    #[async_std::test]
-    async fn test_mimeparser_with_vcard() {
-        let t = TestContext::new().await;
-
-        let raw = include_bytes!("../test-data/message/vcard.eml");
-        let mimeparser = MimeMessage::from_bytes(&t.ctx, &raw[..]).await.unwrap();
-        assert_eq!(mimeparser.parts.len(), 1);
-        assert_eq!(mimeparser.parts[0].typ, Viewtype::Text);
-        assert_eq!(
-            mimeparser.parts[0].msg,
-            "vCard example – An example of vCard sent from Thunderbird."
-        );
-        assert_eq!(mimeparser.user_avatar, None);
-        assert_eq!(mimeparser.group_avatar, None);
-    }
-
     #[async_std::test]
     async fn test_mimeparser_message_kml() {
         let context = TestContext::new().await;
@@ -1934,55 +1851,6 @@ MDYyMDYxNTE1RTlDOEE4Cj4+CnN0YXJ0eHJlZgo4Mjc4CiUlRU9GCg==
         assert_eq!(message.parts[0].msg, "Hello!");
     }
 
-    #[async_std::test]
-    async fn test_hide_html_without_content() {
-        let t = TestContext::new().await;
-        let raw = br#"Date: Thu, 13 Feb 2020 22:41:20 +0000 (UTC)
-From: sender@example.com
-To: receiver@example.com
-Subject: Mail with inline attachment
-MIME-Version: 1.0
-Content-Type: multipart/mixed;
-	boundary="----=_Part_25_46172632.1581201680436"
-
-------=_Part_25_46172632.1581201680436
-Content-Type: text/html; charset=utf-8
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=Windows-1252">
-<meta name="GENERATOR" content="MSHTML 11.00.10570.1001"></head>
-<body><img align="baseline" alt="" src="cid:1712254131-1" border="0" hspace="0">
-</body>
-
-------=_Part_25_46172632.1581201680436
-Content-Type: application/pdf; name="some_pdf.pdf"
-Content-Transfer-Encoding: base64
-Content-Disposition: inline; filename="some_pdf.pdf"
-
-JVBERi0xLjUKJcOkw7zDtsOfCjIgMCBvYmoKPDwvTGVuZ3RoIDMgMCBSL0ZpbHRlci9GbGF0ZURl
-Y29kZT4+CnN0cmVhbQp4nGVOuwoCMRDs8xVbC8aZvC4Hx4Hno7ATAhZi56MTtPH33YtXiLKQ3ZnM
-MDYyMDYxNTE1RTlDOEE4Cj4+CnN0YXJ0eHJlZgo4Mjc4CiUlRU9GCg==
-------=_Part_25_46172632.1581201680436--
-"#;
-
-        let message = MimeMessage::from_bytes(&t.ctx, &raw[..]).await.unwrap();
-
-        assert_eq!(message.parts.len(), 1);
-        assert_eq!(message.parts[0].typ, Viewtype::File);
-        assert_eq!(message.parts[0].msg, "");
-
-        // Make sure the file is there even though the html is wrong:
-        let param = &message.parts[0].param;
-        let blob: BlobObject = param
-            .get_blob(Param::File, &t.ctx, false)
-            .await
-            .unwrap()
-            .unwrap();
-        let f = async_std::fs::File::open(blob.to_abs_path()).await.unwrap();
-        let size = f.metadata().await.unwrap().len();
-        assert_eq!(size, 154);
-    }
-
     #[async_std::test]
     async fn parse_inline_image() {
         let context = TestContext::new().await;
@@ -2241,120 +2109,12 @@ CWt6wx7fiLp0qS9RrX75g6Gqw7nfCs6EcBERcIPt7DTe8VStJwf3LWqVwxl4gQl46yhfoqwEO+I=
         assert!(test.is_empty());
     }
 
-    #[async_std::test]
-    async fn parse_format_flowed_quote() {
-        let context = TestContext::new().await;
-        let raw = br##"Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
-Subject: Re: swipe-to-reply
-MIME-Version: 1.0
-In-Reply-To: <bar@example.org>
-Date: Tue, 06 Oct 2020 00:00:00 +0000
-Chat-Version: 1.0
-Message-ID: <foo@example.org>
-To: bob <bob@example.org>
-From: alice <alice@example.org>
-
-> Long 
-> quote.
-
-Reply
-"##;
-
-        let message = MimeMessage::from_bytes(&context.ctx, &raw[..])
-            .await
+    #[test]
+    fn test_mime_parse_format_flowed() {
+        let mime_type = "text/plain; charset=utf-8; Format=Flowed; DelSp=No"
+            .parse::<mime::Mime>()
             .unwrap();
-        assert_eq!(
-            message.get_subject(),
-            Some("Re: swipe-to-reply".to_string())
-        );
-
-        assert_eq!(message.parts.len(), 1);
-        assert_eq!(message.parts[0].typ, Viewtype::Text);
-        assert_eq!(
-            message.parts[0].param.get(Param::Quote).unwrap(),
-            "Long quote."
-        );
-        assert_eq!(message.parts[0].msg, "Reply");
-    }
-
-    #[async_std::test]
-    async fn parse_quote_without_reply() {
-        let context = TestContext::new().await;
-        let raw = br##"Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
-Subject: Re: swipe-to-reply
-MIME-Version: 1.0
-In-Reply-To: <bar@example.org>
-Date: Tue, 06 Oct 2020 00:00:00 +0000
-Message-ID: <foo@example.org>
-To: bob <bob@example.org>
-From: alice <alice@example.org>
-
-> Just a quote.
-"##;
-
-        let message = MimeMessage::from_bytes(&context.ctx, &raw[..])
-            .await
-            .unwrap();
-        assert_eq!(
-            message.get_subject(),
-            Some("Re: swipe-to-reply".to_string())
-        );
-
-        assert_eq!(message.parts.len(), 1);
-        assert_eq!(message.parts[0].typ, Viewtype::Text);
-        assert_eq!(
-            message.parts[0].param.get(Param::Quote).unwrap(),
-            "Just a quote."
-        );
-        assert_eq!(message.parts[0].msg, "");
-    }
-
-    #[async_std::test]
-    async fn parse_quote_top_posting() {
-        let context = TestContext::new().await;
-        let raw = br##"Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
-Subject: Re: top posting
-MIME-Version: 1.0
-In-Reply-To: <bar@example.org>
-Message-ID: <foo@example.org>
-To: bob <bob@example.org>
-From: alice <alice@example.org>
-
-A reply.
-
-On 2020-10-25, Bob wrote:
-> A quote.
-"##;
-
-        let message = MimeMessage::from_bytes(&context.ctx, &raw[..])
-            .await
-            .unwrap();
-        assert_eq!(message.get_subject(), Some("Re: top posting".to_string()));
-
-        assert_eq!(message.parts.len(), 1);
-        assert_eq!(message.parts[0].typ, Viewtype::Text);
-        assert_eq!(
-            message.parts[0].param.get(Param::Quote).unwrap(),
-            "A quote."
-        );
-        assert_eq!(message.parts[0].msg, "A reply.");
-    }
-
-    #[async_std::test]
-    async fn test_attachment_quote() {
-        let context = TestContext::new().await;
-        let raw = include_bytes!("../test-data/message/quote_attach.eml");
-        let mimeparser = MimeMessage::from_bytes(&context.ctx, &raw[..])
-            .await
-            .unwrap();
-
-        assert_eq!(mimeparser.get_subject().unwrap(), "Message from Alice");
-        assert_eq!(mimeparser.parts.len(), 1);
-        assert_eq!(mimeparser.parts[0].msg, "Reply");
-        assert_eq!(
-            mimeparser.parts[0].param.get(Param::Quote).unwrap(),
-            "Quote"
-        );
-        assert_eq!(mimeparser.parts[0].typ, Viewtype::File);
+        let format_param = mime_type.get_param("format").unwrap();
+        assert_eq!(format_param.as_str().to_ascii_lowercase(), "flowed");
     }
 }

src/oauth2.rs

@@ -170,14 +170,16 @@ pub async fn dc_get_oauth2_access_token(
         }
 
         // ... and POST
-        let mut req = surf::post(post_url).build();
-        if let Err(err) = req.body_form(&post_param) {
-            warn!(context, "Error calling OAuth2 at {}: {:?}", token_url, err);
+        let response = surf::post(post_url).body_form(&post_param);
+        if response.is_err() {
+            warn!(
+                context,
+                "Error calling OAuth2 at {}: {:?}", token_url, response
+            );
             return None;
         }
 
-        let client = surf::Client::new();
-        let parsed: Result<Response, _> = client.recv_json(req).await;
+        let parsed: Result<Response, _> = response.unwrap().recv_json().await;
         if parsed.is_err() {
             warn!(
                 context,
@@ -303,7 +305,7 @@ impl Oauth2 {
 
                     let mut fqdn: String = String::from(domain.as_ref());
                     if !fqdn.ends_with('.') {
-                        fqdn.push('.');
+                        fqdn.push_str(".");
                     }
 
                     if let Ok(res) = resolver.mx_lookup(fqdn).await {
@@ -321,7 +323,7 @@ impl Oauth2 {
     }
 
     async fn get_addr(&self, context: &Context, access_token: impl AsRef<str>) -> Option<String> {
-        let userinfo_url = self.get_userinfo.unwrap_or("");
+        let userinfo_url = self.get_userinfo.unwrap_or_else(|| "");
         let userinfo_url = replace_in_uri(&userinfo_url, "$ACCESS_TOKEN", access_token);
 
         // should returns sth. as

src/param.rs

@@ -3,13 +3,12 @@ use std::fmt;
 use std::str;
 
 use async_std::path::PathBuf;
-use itertools::Itertools;
 use num_traits::FromPrimitive;
 use serde::{Deserialize, Serialize};
 
 use crate::blob::{BlobError, BlobObject};
 use crate::context::Context;
-use crate::error::{self, bail};
+use crate::error::{self, bail, ensure};
 use crate::message::MsgId;
 use crate::mimeparser::SystemMessage;
 
@@ -53,9 +52,6 @@ pub enum Param {
     /// For Messages
     Forwarded = b'a',
 
-    /// For Messages: quoted text.
-    Quote = b'q',
-
     /// For Messages
     Cmd = b'S',
 
@@ -150,12 +146,7 @@ impl fmt::Display for Params {
             if i > 0 {
                 writeln!(f)?;
             }
-            write!(
-                f,
-                "{}={}",
-                *key as u8 as char,
-                value.split('\n').join("\n\n")
-            )?;
+            write!(f, "{}={}", *key as u8 as char, value)?;
         }
         Ok(())
     }
@@ -166,28 +157,27 @@ impl str::FromStr for Params {
 
     fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
         let mut inner = BTreeMap::new();
-        let mut lines = s.lines().peekable();
+        for pair in s.trim().lines() {
+            let pair = pair.trim();
+            if pair.is_empty() {
+                continue;
+            }
+            // TODO: probably nicer using a regex
+            ensure!(pair.len() > 1, "Invalid key pair: '{}'", pair);
+            let mut split = pair.splitn(2, '=');
+            let key = split.next();
+            let value = split.next();
 
-        while let Some(line) = lines.next() {
-            if let [key, value] = line.splitn(2, '=').collect::<Vec<_>>()[..] {
-                let key = key.to_string();
-                let mut value = value.to_string();
-                while let Some(s) = lines.peek() {
-                    if !s.is_empty() {
-                        break;
-                    }
-                    lines.next();
-                    value.push('\n');
-                    value += lines.next().unwrap_or_default();
-                }
+            ensure!(key.is_some(), "Missing key");
+            ensure!(value.is_some(), "Missing value");
 
-                if let Some(key) = key.as_bytes().first().and_then(|key| Param::from_u8(*key)) {
-                    inner.insert(key, value);
-                } else {
-                    bail!("Unknown key: {}", key);
-                }
+            let key = key.unwrap_or_default().trim();
+            let value = value.unwrap_or_default().trim();
+
+            if let Some(key) = key.as_bytes().first().and_then(|key| Param::from_u8(*key)) {
+                inner.insert(key, value.to_string());
             } else {
-                bail!("Not a key-value pair: {:?}", line);
+                bail!("Unknown key: {}", key);
             }
         }
 
@@ -383,7 +373,7 @@ mod tests {
 
     #[test]
     fn test_dc_param() {
-        let mut p1: Params = "a=1\nf=2\nc=3".parse().unwrap();
+        let mut p1: Params = "\r\n\r\na=1\nf=2\n\nc = 3 ".parse().unwrap();
 
         assert_eq!(p1.get_int(Param::Forwarded), Some(1));
         assert_eq!(p1.get_int(Param::File), Some(2));
@@ -417,14 +407,6 @@ mod tests {
         assert_eq!(p1.len(), 0)
     }
 
-    #[test]
-    fn test_roundtrip() {
-        let mut params = Params::new();
-        params.set(Param::Height, "foo\nbar=baz\nquux");
-        params.set(Param::Width, "\n\n\na=\n=");
-        assert_eq!(params.to_string().parse::<Params>().unwrap(), params);
-    }
-
     #[test]
     fn test_regression() {
         let p1: Params = "a=cli%40deltachat.de\nn=\ni=TbnwJ6lSvD5\ns=0ejvbdFSQxB"

src/pgp.rs

@@ -381,7 +381,7 @@ pub async fn symm_decrypt<T: std::io::Read + std::io::Seek>(
 mod tests {
     use super::*;
     use crate::test_utils::*;
-    use once_cell::sync::Lazy;
+    use lazy_static::lazy_static;
 
     #[test]
     fn test_split_armored_data_1() {
@@ -449,29 +449,26 @@ mod tests {
     /// The original text of [CTEXT_SIGNED]
     static CLEARTEXT: &[u8] = b"This is a test";
 
-    /// Initialised [TestKeys] for tests.
-    static KEYS: Lazy<TestKeys> = Lazy::new(TestKeys::new);
+    lazy_static! {
+        /// Initialised [TestKeys] for tests.
+        static ref KEYS: TestKeys = TestKeys::new();
 
-    /// A cyphertext encrypted to Alice & Bob, signed by Alice.
-    static CTEXT_SIGNED: Lazy<String> = Lazy::new(|| {
-        let mut keyring = Keyring::new();
-        keyring.add(KEYS.alice_public.clone());
-        keyring.add(KEYS.bob_public.clone());
-        futures_lite::future::block_on(pk_encrypt(
-            CLEARTEXT,
-            keyring,
-            Some(KEYS.alice_secret.clone()),
-        ))
-        .unwrap()
-    });
+        /// 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()
+        };
 
-    /// A cyphertext encrypted to Alice & Bob, not signed.
-    static CTEXT_UNSIGNED: Lazy<String> = Lazy::new(|| {
-        let mut keyring = Keyring::new();
-        keyring.add(KEYS.alice_public.clone());
-        keyring.add(KEYS.bob_public.clone());
-        futures_lite::future::block_on(pk_encrypt(CLEARTEXT, keyring, None)).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()
+        };
+    }
 
     #[test]
     fn test_encrypt_signed() {

src/provider/mod.rs

@@ -4,8 +4,7 @@ mod data;
 
 use crate::config::Config;
 use crate::dc_tools::EmailAddress;
-use crate::provider::data::{PROVIDER_DATA, PROVIDER_UPDATED};
-use chrono::{NaiveDateTime, NaiveTime};
+use crate::provider::data::PROVIDER_DATA;
 
 #[derive(Debug, Display, Copy, Clone, PartialEq, FromPrimitive, ToPrimitive)]
 #[repr(u8)]
@@ -75,7 +74,6 @@ pub struct Provider {
     pub server: Vec<Server>,
     pub config_defaults: Option<Vec<ConfigDefault>>,
     pub strict_tls: bool,
-    pub max_smtp_rcpt_to: Option<u16>,
     pub oauth2_authorizer: Option<Oauth2Authorizer>,
 }
 
@@ -93,18 +91,11 @@ pub fn get_provider_info(addr: &str) -> Option<&Provider> {
     None
 }
 
-// returns update timestamp in seconds, UTC, compatible for comparison with time() and database times
-pub fn get_provider_update_timestamp() -> i64 {
-    NaiveDateTime::new(*PROVIDER_UPDATED, NaiveTime::from_hms(0, 0, 0)).timestamp_millis() / 1_000
-}
-
 #[cfg(test)]
 mod tests {
     #![allow(clippy::indexing_slicing)]
 
     use super::*;
-    use crate::dc_tools::time;
-    use chrono::NaiveDate;
 
     #[test]
     fn test_get_provider_info_unexistant() {
@@ -147,16 +138,4 @@ mod tests {
         let provider = get_provider_info("user@googlemail.com").unwrap();
         assert!(provider.status == Status::PREPARATION);
     }
-
-    #[test]
-    fn test_get_provider_update_timestamp() {
-        let timestamp_past = NaiveDateTime::new(
-            NaiveDate::from_ymd(2020, 9, 9),
-            NaiveTime::from_hms(0, 0, 0),
-        )
-        .timestamp_millis()
-            / 1_000;
-        assert!(get_provider_update_timestamp() <= time());
-        assert!(get_provider_update_timestamp() > timestamp_past);
-    }
 }

src/provider/update.py

@@ -4,7 +4,6 @@
 import sys
 import os
 import yaml
-import datetime
 
 out_all = ""
 out_domains = ""
@@ -42,8 +41,8 @@ def process_config_defaults(data):
     config_defaults = data.get("config_defaults", "")
     for key in config_defaults:
         value = str(config_defaults[key])
-        defaults += "        ConfigDefault { key: Config::" + camel(key) + ", value: \"" + value + "\" },\n"
-    defaults += "    ])"
+        defaults += "            ConfigDefault { key: Config::" + camel(key) + ", value: \"" + value + "\" },\n"
+    defaults += "        ])"
     return defaults
 
 
@@ -66,7 +65,7 @@ def process_data(data, file):
             raise TypeError("domain used twice: " + domain)
         domains_dict[domain] = True
 
-        domains += "    (\"" + domain + "\", &*" + file2varname(file) + "),\n"
+        domains += "        (\"" + domain + "\", &*" + file2varname(file) + "),\n"
         comment += domain + ", "
 
 
@@ -96,7 +95,7 @@ def process_data(data, file):
             if username_pattern != "EMAIL" and username_pattern != "EMAILLOCALPART":
                 raise TypeError("bad username pattern")
 
-            server += ("        Server { protocol: " + protocol + ", socket: " + socket + ", hostname: \""
+            server += ("            Server { protocol: " + protocol + ", socket: " + socket + ", hostname: \""
             + hostname + "\", port: " + str(port) + ", username_pattern: " + username_pattern + " },\n")
 
     config_defaults = process_config_defaults(data)
@@ -104,9 +103,6 @@ def process_data(data, file):
     strict_tls = data.get("strict_tls", False)
     strict_tls = "true" if strict_tls else "false"
 
-    max_smtp_rcpt_to = data.get("max_smtp_rcpt_to", 0)
-    max_smtp_rcpt_to = "Some(" + str(max_smtp_rcpt_to) + ")" if max_smtp_rcpt_to != 0 else "None"
-
     oauth2 = data.get("oauth2", "")
     oauth2 = "Some(Oauth2Authorizer::" + camel(oauth2) + ")" if oauth2 != "" else "None"
 
@@ -114,17 +110,16 @@ def process_data(data, file):
     before_login_hint = cleanstr(data.get("before_login_hint", ""))
     after_login_hint = cleanstr(data.get("after_login_hint", ""))
     if (not has_imap and not has_smtp) or (has_imap and has_smtp):
-        provider += "static " + file2varname(file) + ": Lazy<Provider> = Lazy::new(|| Provider {\n"
-        provider += "    status: Status::" + status + ",\n"
-        provider += "    before_login_hint: \"" + before_login_hint + "\",\n"
-        provider += "    after_login_hint: \"" + after_login_hint + "\",\n"
-        provider += "    overview_page: \"" + file2url(file) + "\",\n"
-        provider += "    server: vec![\n" + server + "    ],\n"
-        provider += "    config_defaults: " + config_defaults + ",\n"
-        provider += "    strict_tls: " + strict_tls + ",\n"
-        provider += "    max_smtp_rcpt_to: " + max_smtp_rcpt_to + ",\n"
-        provider += "    oauth2_authorizer: " + oauth2 + ",\n"
-        provider += "});\n\n"
+        provider += "    static ref " + file2varname(file) + ": Provider = Provider {\n"
+        provider += "        status: Status::" + status + ",\n"
+        provider += "        before_login_hint: \"" + before_login_hint + "\",\n"
+        provider += "        after_login_hint: \"" + after_login_hint + "\",\n"
+        provider += "        overview_page: \"" + file2url(file) + "\",\n"
+        provider += "        server: vec![\n" + server + "        ],\n"
+        provider += "        config_defaults: " + config_defaults + ",\n"
+        provider += "        strict_tls: " + strict_tls + ",\n"
+        provider += "        oauth2_authorizer: " + oauth2 + ",\n"
+        provider += "    };\n\n"
     else:
         raise TypeError("SMTP and IMAP must be specified together or left out both")
 
@@ -133,7 +128,7 @@ def process_data(data, file):
 
     # finally, add the provider
     global out_all, out_domains
-    out_all += "// " + file[file.rindex("/")+1:] + ": " + comment.strip(", ") + "\n"
+    out_all += "    // " + file[file.rindex("/")+1:] + ": " + comment.strip(", ") + "\n"
 
     # also add provider with no special things to do -
     # eg. _not_ supporting oauth2 is also an information and we can skip the mx-lookup in this case
@@ -168,16 +163,12 @@ if __name__ == "__main__":
     "use crate::provider::UsernamePattern::*;\n"
     "use crate::provider::*;\n"
     "use std::collections::HashMap;\n\n"
-    "use once_cell::sync::Lazy;\n\n")
+    "lazy_static::lazy_static! {\n\n")
 
     process_dir(sys.argv[1])
 
-    out_all += "pub static PROVIDER_DATA: Lazy<HashMap<&'static str, &'static Provider>> = Lazy::new(|| [\n"
+    out_all += "    pub static ref PROVIDER_DATA: HashMap<&'static str, &'static Provider> = [\n"
     out_all += out_domains;
-    out_all += "].iter().copied().collect());\n\n"
-
-    now = datetime.datetime.utcnow()
-    out_all += "pub static PROVIDER_UPDATED: Lazy<chrono::NaiveDate> = "\
-               "Lazy::new(|| chrono::NaiveDate::from_ymd("+str(now.year)+", "+str(now.month)+", "+str(now.day)+"));\n"
+    out_all += "    ].iter().copied().collect();\n}"
 
     print(out_all)

src/qr.rs

@@ -1,6 +1,6 @@
 //! # QR code module
 
-use once_cell::sync::Lazy;
+use lazy_static::lazy_static;
 use percent_encoding::percent_decode_str;
 use serde::Deserialize;
 
@@ -358,10 +358,12 @@ async fn decode_matmsg(context: &Context, qr: &str) -> Lot {
     Lot::from_address(context, name, addr).await
 }
 
-static VCARD_NAME_RE: Lazy<regex::Regex> =
-    Lazy::new(|| regex::Regex::new(r"(?m)^N:([^;]*);([^;\n]*)").unwrap());
-static VCARD_EMAIL_RE: Lazy<regex::Regex> =
-    Lazy::new(|| regex::Regex::new(r"(?m)^EMAIL([^:\n]*):([^;\n]*)").unwrap());
+lazy_static! {
+    static ref VCARD_NAME_RE: regex::Regex =
+        regex::Regex::new(r"(?m)^N:([^;]*);([^;\n]*)").unwrap();
+    static ref VCARD_EMAIL_RE: regex::Regex =
+        regex::Regex::new(r"(?m)^EMAIL([^:\n]*):([^;\n]*)").unwrap();
+}
 
 /// Extract address for the matmsg scheme.
 ///

src/scheduler.rs

@@ -3,7 +3,6 @@ use async_std::sync::{channel, Receiver, Sender};
 use async_std::task;
 
 use crate::context::Context;
-use crate::dc_tools::maybe_add_time_based_warnings;
 use crate::imap::Imap;
 use crate::job::{self, Thread};
 use crate::{config::Config, message::MsgId, smtp::Smtp};
@@ -69,11 +68,9 @@ async fn inbox_loop(ctx: Context, started: Sender<()>, inbox_handlers: ImapConne
                 }
                 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;
-                    if ctx.get_config_bool(Config::InboxWatch).await {
-                        info!(ctx, "postponing imap-job {} to run fetch...", job);
-                        fetch(&ctx, &mut connection).await;
-                    }
+                    fetch(&ctx, &mut connection).await;
                 }
                 None => {
                     jobs_loaded = 0;
@@ -84,8 +81,6 @@ async fn inbox_loop(ctx: Context, started: Sender<()>, inbox_handlers: ImapConne
                         warn!(ctx, "failed to close folder: {:?}", err);
                     }
 
-                    maybe_add_time_based_warnings(&ctx).await;
-
                     info = if ctx.get_config_bool(Config::InboxWatch).await {
                         fetch_idle(&ctx, &mut connection, Config::ConfiguredInboxFolder).await
                     } else {
@@ -133,7 +128,7 @@ async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder: Config) -> Int
             // connect and fake idle if unable to connect
             if let Err(err) = connection.connect_configured(&ctx).await {
                 warn!(ctx, "imap connection failed: {}", err);
-                return connection.fake_idle(&ctx, Some(watch_folder)).await;
+                return connection.fake_idle(&ctx, None).await;
             }
 
             // fetch
@@ -417,7 +412,10 @@ impl Scheduler {
 
     /// Check if the scheduler is running.
     pub fn is_running(&self) -> bool {
-        matches!(self, Scheduler::Running { .. })
+        match self {
+            Scheduler::Running { .. } => true,
+            _ => false,
+        }
     }
 }
 

src/securejoin.rs

@@ -348,7 +348,7 @@ async fn securejoin(context: &Context, qr: &str) -> Result<ChatId, JoinError> {
                 let bob = context.bob.read().await;
                 let grpid = bob.qr_scan.as_ref().unwrap().text2.as_ref().unwrap();
                 match chat::get_chat_id_by_grpid(context, grpid).await {
-                    Ok((chatid, _is_protected, _blocked)) => break chatid,
+                    Ok((chatid, _is_verified, _blocked)) => break chatid,
                     Err(err) => {
                         if start.elapsed() > Duration::from_secs(7) {
                             return Err(JoinError::MissingChat(err));
@@ -791,19 +791,19 @@ pub(crate) async fn handle_securejoin_handshake(
 
             let vg_expect_encrypted = if join_vg {
                 let group_id = get_qr_attr!(context, text2).to_string();
-                // This is buggy, is_protected_group will always be
+                // This is buggy, is_verified_group will always be
                 // false since the group is created by receive_imf by
                 // the very handshake message we're handling now.  But
                 // only after we have returned.  It does not impact
                 // the security invariants of secure-join however.
-                let (_, is_protected_group, _) = chat::get_chat_id_by_grpid(context, &group_id)
+                let (_, is_verified_group, _) = chat::get_chat_id_by_grpid(context, &group_id)
                     .await
                     .unwrap_or((ChatId::new(0), false, Blocked::Not));
                 // when joining a non-verified group
                 // the vg-member-added message may be unencrypted
                 // when not all group members have keys or prefer encryption.
                 // So only expect encryption if this is a verified group
-                is_protected_group
+                is_verified_group
             } else {
                 // setup contact is always encrypted
                 true
@@ -1102,7 +1102,6 @@ mod tests {
     use super::*;
 
     use crate::chat;
-    use crate::chat::ProtectionStatus;
     use crate::peerstate::Peerstate;
     use crate::test_utils::TestContext;
 
@@ -1329,7 +1328,7 @@ mod tests {
         let alice = TestContext::new_alice().await;
         let bob = TestContext::new_bob().await;
 
-        let chatid = chat::create_group_chat(&alice.ctx, ProtectionStatus::Protected, "the chat")
+        let chatid = chat::create_group_chat(&alice.ctx, VerifiedStatus::Verified, "the chat")
             .await
             .unwrap();
 
@@ -1428,6 +1427,6 @@ mod tests {
 
         let bob_chatid = joiner.await;
         let bob_chat = Chat::load_from_db(&bob.ctx, bob_chatid).await.unwrap();
-        assert!(bob_chat.is_protected());
+        assert!(bob_chat.is_verified());
     }
 }

src/simplify.rs

@@ -1,5 +1,3 @@
-use itertools::Itertools;
-
 // protect lines starting with `--` against being treated as a footer.
 // for that, we insert a ZERO WIDTH SPACE (ZWSP, 0x200B);
 // this should be invisible on most systems and there is no need to unescape it again
@@ -66,32 +64,33 @@ fn split_lines(buf: &str) -> Vec<&str> {
 
 /// Simplify message text for chat display.
 /// Remove quotes, signatures, trailing empty lines etc.
-pub fn simplify(mut input: String, is_chat_message: bool) -> (String, bool, Option<String>) {
+pub fn simplify(mut input: String, is_chat_message: bool) -> (String, bool) {
     input.retain(|c| c != '\r');
     let lines = split_lines(&input);
     let (lines, is_forwarded) = skip_forward_header(&lines);
 
-    let (lines, mut top_quote) = remove_top_quote(lines);
     let original_lines = &lines;
+
     let lines = remove_message_footer(lines);
 
     let text = if is_chat_message {
-        render_message(lines, false)
+        render_message(lines, false, false)
     } else {
         let (lines, has_nonstandard_footer) = remove_nonstandard_footer(lines);
-        let (lines, mut bottom_quote) = remove_bottom_quote(lines);
-
-        if top_quote.is_none() && bottom_quote.is_some() {
-            std::mem::swap(&mut top_quote, &mut bottom_quote);
-        }
+        let (lines, has_bottom_quote) = remove_bottom_quote(lines);
+        let (lines, has_top_quote) = remove_top_quote(lines);
 
         if lines.iter().all(|it| it.trim().is_empty()) {
-            render_message(original_lines, false)
+            render_message(original_lines, false, false)
         } else {
-            render_message(lines, has_nonstandard_footer || bottom_quote.is_some())
+            render_message(
+                lines,
+                has_top_quote,
+                has_nonstandard_footer || has_bottom_quote,
+            )
         }
     };
-    (text, is_forwarded, top_quote)
+    (text, is_forwarded)
 }
 
 /// Skips "forwarded message" header.
@@ -109,27 +108,16 @@ fn skip_forward_header<'a>(lines: &'a [&str]) -> (&'a [&'a str], bool) {
 }
 
 #[allow(clippy::indexing_slicing)]
-fn remove_bottom_quote<'a>(lines: &'a [&str]) -> (&'a [&'a str], Option<String>) {
-    let mut first_quoted_line = lines.len();
+fn remove_bottom_quote<'a>(lines: &'a [&str]) -> (&'a [&'a str], bool) {
     let mut last_quoted_line = None;
     for (l, line) in lines.iter().enumerate().rev() {
         if is_plain_quote(line) {
-            if last_quoted_line.is_none() {
-                first_quoted_line = l + 1;
-            }
             last_quoted_line = Some(l)
         } else if !is_empty_line(line) {
             break;
         }
     }
     if let Some(mut l_last) = last_quoted_line {
-        let quoted_text = lines[l_last..first_quoted_line]
-            .iter()
-            .map(|s| {
-                s.strip_prefix(">")
-                    .map_or(*s, |u| u.strip_prefix(" ").unwrap_or(u))
-            })
-            .join("\n");
         if l_last > 1 && is_empty_line(lines[l_last - 1]) {
             l_last -= 1
         }
@@ -139,22 +127,18 @@ fn remove_bottom_quote<'a>(lines: &'a [&str]) -> (&'a [&'a str], Option<String>)
                 l_last -= 1
             }
         }
-        (&lines[..l_last], Some(quoted_text))
+        (&lines[..l_last], true)
     } else {
-        (lines, None)
+        (lines, false)
     }
 }
 
 #[allow(clippy::indexing_slicing)]
-fn remove_top_quote<'a>(lines: &'a [&str]) -> (&'a [&'a str], Option<String>) {
-    let mut first_quoted_line = 0;
+fn remove_top_quote<'a>(lines: &'a [&str]) -> (&'a [&'a str], bool) {
     let mut last_quoted_line = None;
     let mut has_quoted_headline = false;
     for (l, line) in lines.iter().enumerate() {
         if is_plain_quote(line) {
-            if last_quoted_line.is_none() {
-                first_quoted_line = l;
-            }
             last_quoted_line = Some(l)
         } else if !is_empty_line(line) {
             if is_quoted_headline(line) && !has_quoted_headline && last_quoted_line.is_none() {
@@ -166,25 +150,17 @@ fn remove_top_quote<'a>(lines: &'a [&str]) -> (&'a [&'a str], Option<String>) {
         }
     }
     if let Some(last_quoted_line) = last_quoted_line {
-        (
-            &lines[last_quoted_line + 1..],
-            Some(
-                lines[first_quoted_line..last_quoted_line + 1]
-                    .iter()
-                    .map(|s| {
-                        s.strip_prefix(">")
-                            .map_or(*s, |u| u.strip_prefix(" ").unwrap_or(u))
-                    })
-                    .join("\n"),
-            ),
-        )
+        (&lines[last_quoted_line + 1..], true)
     } else {
-        (lines, None)
+        (lines, false)
     }
 }
 
-fn render_message(lines: &[&str], is_cut_at_end: bool) -> String {
+fn render_message(lines: &[&str], is_cut_at_begin: bool, is_cut_at_end: bool) -> String {
     let mut ret = String::new();
+    if is_cut_at_begin {
+        ret += "[...]";
+    }
     /* we write empty lines only in case and non-empty line follows */
     let mut pending_linebreaks = 0;
     let mut empty_body = true;
@@ -207,7 +183,7 @@ fn render_message(lines: &[&str], is_cut_at_end: bool) -> String {
             pending_linebreaks = 1
         }
     }
-    if is_cut_at_end && !empty_body {
+    if is_cut_at_end && (!is_cut_at_begin || !empty_body) {
         ret += " [...]";
     }
     // redo escaping done by escape_message_footer_marks()
@@ -255,7 +231,7 @@ mod tests {
         #[test]
         // proptest does not support [[:graphical:][:space:]] regex.
         fn test_simplify_plain_text_fuzzy(input in "[!-~\t \n]+") {
-            let (output, _is_forwarded, _) = simplify(input, true);
+            let (output, _is_forwarded) = simplify(input, true);
             assert!(output.split('\n').all(|s| s != "-- "));
         }
     }
@@ -263,7 +239,7 @@ mod tests {
     #[test]
     fn test_dont_remove_whole_message() {
         let input = "\n------\nFailed\n------\n\nUh-oh, this workflow did not succeed!\n\nlots of other text".to_string();
-        let (plain, is_forwarded, _) = simplify(input, false);
+        let (plain, is_forwarded) = simplify(input, false);
         assert_eq!(
             plain,
             "------\nFailed\n------\n\nUh-oh, this workflow did not succeed!\n\nlots of other text"
@@ -274,7 +250,7 @@ mod tests {
     #[test]
     fn test_chat_message() {
         let input = "Hi! How are you?\n\n---\n\nI am good.\n-- \nSent with my Delta Chat Messenger: https://delta.chat".to_string();
-        let (plain, is_forwarded, _) = simplify(input, true);
+        let (plain, is_forwarded) = simplify(input, true);
         assert_eq!(plain, "Hi! How are you?\n\n---\n\nI am good.");
         assert!(!is_forwarded);
     }
@@ -282,7 +258,7 @@ mod tests {
     #[test]
     fn test_simplify_trim() {
         let input = "line1\n\r\r\rline2".to_string();
-        let (plain, is_forwarded, _) = simplify(input, false);
+        let (plain, is_forwarded) = simplify(input, false);
 
         assert_eq!(plain, "line1\nline2");
         assert!(!is_forwarded);
@@ -291,7 +267,7 @@ mod tests {
     #[test]
     fn test_simplify_forwarded_message() {
         let input = "---------- Forwarded message ----------\r\nFrom: test@example.com\r\n\r\nForwarded message\r\n-- \r\nSignature goes here".to_string();
-        let (plain, is_forwarded, _) = simplify(input, false);
+        let (plain, is_forwarded) = simplify(input, false);
 
         assert_eq!(plain, "Forwarded message");
         assert!(is_forwarded);
@@ -311,17 +287,17 @@ mod tests {
 
     #[test]
     fn test_remove_top_quote() {
-        let (lines, top_quote) = remove_top_quote(&["> first", "> second"]);
+        let (lines, has_top_quote) = remove_top_quote(&["> first", "> second"]);
         assert!(lines.is_empty());
-        assert_eq!(top_quote.unwrap(), "first\nsecond");
+        assert!(has_top_quote);
 
-        let (lines, top_quote) = remove_top_quote(&["> first", "> second", "not a quote"]);
+        let (lines, has_top_quote) = remove_top_quote(&["> first", "> second", "not a quote"]);
         assert_eq!(lines, &["not a quote"]);
-        assert_eq!(top_quote.unwrap(), "first\nsecond");
+        assert!(has_top_quote);
 
-        let (lines, top_quote) = remove_top_quote(&["not a quote", "> first", "> second"]);
+        let (lines, has_top_quote) = remove_top_quote(&["not a quote", "> first", "> second"]);
         assert_eq!(lines, &["not a quote", "> first", "> second"]);
-        assert!(top_quote.is_none());
+        assert!(!has_top_quote);
     }
 
     #[test]
@@ -336,41 +312,41 @@ mod tests {
     #[test]
     fn test_remove_message_footer() {
         let input = "text\n--\nno footer".to_string();
-        let (plain, _, _) = simplify(input, true);
+        let (plain, _) = simplify(input, true);
         assert_eq!(plain, "text\n--\nno footer");
 
         let input = "text\n\n--\n\nno footer".to_string();
-        let (plain, _, _) = simplify(input, true);
+        let (plain, _) = simplify(input, true);
         assert_eq!(plain, "text\n\n--\n\nno footer");
 
         let input = "text\n\n-- no footer\n\n".to_string();
-        let (plain, _, _) = simplify(input, true);
+        let (plain, _) = simplify(input, true);
         assert_eq!(plain, "text\n\n-- no footer");
 
         let input = "text\n\n--\nno footer\n-- \nfooter".to_string();
-        let (plain, _, _) = simplify(input, true);
+        let (plain, _) = simplify(input, true);
         assert_eq!(plain, "text\n\n--\nno footer");
 
         let input = "text\n\n--\ntreated as footer when unescaped".to_string();
-        let (plain, _, _) = simplify(input.clone(), true);
+        let (plain, _) = simplify(input.clone(), true);
         assert_eq!(plain, "text"); // see remove_message_footer() for some explanations
         let escaped = escape_message_footer_marks(&input);
-        let (plain, _, _) = simplify(escaped, true);
+        let (plain, _) = simplify(escaped, true);
         assert_eq!(plain, "text\n\n--\ntreated as footer when unescaped");
 
         // Nonstandard footer sent by https://siju.es/
         let input = "Message text here\n---Desde mi teléfono con SIJÚ\n\nQuote here".to_string();
-        let (plain, _, _) = simplify(input.clone(), false);
+        let (plain, _) = simplify(input.clone(), false);
         assert_eq!(plain, "Message text here [...]");
-        let (plain, _, _) = simplify(input.clone(), true);
+        let (plain, _) = simplify(input.clone(), true);
         assert_eq!(plain, input);
 
         let input = "--\ntreated as footer when unescaped".to_string();
-        let (plain, _, _) = simplify(input.clone(), true);
+        let (plain, _) = simplify(input.clone(), true);
         assert_eq!(plain, ""); // see remove_message_footer() for some explanations
 
         let escaped = escape_message_footer_marks(&input);
-        let (plain, _, _) = simplify(escaped, true);
+        let (plain, _) = simplify(escaped, true);
         assert_eq!(plain, "--\ntreated as footer when unescaped");
     }
 }

src/smtp/mod.rs

@@ -30,7 +30,7 @@ pub enum Error {
         error: error::Error,
     },
 
-    #[error("SMTP: failed to connect: {0}")]
+    #[error("SMTP: failed to connect: {0:?}")]
     ConnectionFailure(#[source] smtp::error::Error),
 
     #[error("SMTP: failed to setup connection {0:?}")]
@@ -192,8 +192,7 @@ impl Smtp {
         };
 
         let security = match lp.security {
-            Socket::Plain => smtp::ClientSecurity::None,
-            Socket::STARTTLS => smtp::ClientSecurity::Required(tls_parameters),
+            Socket::STARTTLS | Socket::Plain => smtp::ClientSecurity::Opportunistic(tls_parameters),
             _ => smtp::ClientSecurity::Wrapper(tls_parameters),
         };
 

src/smtp/send.rs

@@ -3,11 +3,8 @@
 use super::Smtp;
 use async_smtp::*;
 
-use crate::config::Config;
-use crate::constants::DEFAULT_MAX_SMTP_RCPT_TO;
 use crate::context::Context;
 use crate::events::EventType;
-use crate::provider::get_provider_info;
 use itertools::Itertools;
 use std::time::Duration;
 
@@ -37,51 +34,37 @@ impl Smtp {
     ) -> Result<()> {
         let message_len_bytes = message.len();
 
-        let mut chunk_size = DEFAULT_MAX_SMTP_RCPT_TO;
-        if let Some(provider) = get_provider_info(
-            &context
-                .get_config(Config::ConfiguredAddr)
+        let recipients_display = recipients.iter().map(|x| x.to_string()).join(",");
+
+        let envelope =
+            Envelope::new(self.from.clone(), recipients).map_err(Error::EnvelopeError)?;
+        let mail = SendableEmail::new(
+            envelope,
+            format!("{}", job_id), // only used for internal logging
+            message,
+        );
+
+        if let Some(ref mut transport) = self.transport {
+            // The timeout is 1min + 3min per MB.
+            let timeout = 60 + (180 * message_len_bytes / 1_000_000) as u64;
+            transport
+                .send_with_timeout(mail, Some(&Duration::from_secs(timeout)))
                 .await
-                .unwrap_or_default(),
-        ) {
-            if let Some(max_smtp_rcpt_to) = provider.max_smtp_rcpt_to {
-                chunk_size = max_smtp_rcpt_to as usize;
-            }
-        }
+                .map_err(Error::SendError)?;
 
-        for recipients_chunk in recipients.chunks(chunk_size).into_iter() {
-            let recipients = recipients_chunk.to_vec();
-            let recipients_display = recipients.iter().map(|x| x.to_string()).join(",");
+            context.emit_event(EventType::SmtpMessageSent(format!(
+                "Message len={} was smtp-sent to {}",
+                message_len_bytes, recipients_display
+            )));
+            self.last_success = Some(std::time::SystemTime::now());
 
-            let envelope =
-                Envelope::new(self.from.clone(), recipients).map_err(Error::EnvelopeError)?;
-            let mail = SendableEmail::new(
-                envelope,
-                format!("{}", job_id), // only used for internal logging
-                &message,
+            Ok(())
+        } else {
+            warn!(
+                context,
+                "uh? SMTP has no transport, failed to send to {}", recipients_display
             );
-
-            if let Some(ref mut transport) = self.transport {
-                // The timeout is 1min + 3min per MB.
-                let timeout = 60 + (180 * message_len_bytes / 1_000_000) as u64;
-                transport
-                    .send_with_timeout(mail, Some(&Duration::from_secs(timeout)))
-                    .await
-                    .map_err(Error::SendError)?;
-
-                context.emit_event(EventType::SmtpMessageSent(format!(
-                    "Message len={} was smtp-sent to {}",
-                    message_len_bytes, recipients_display
-                )));
-                self.last_success = Some(std::time::SystemTime::now());
-            } else {
-                warn!(
-                    context,
-                    "uh? SMTP has no transport, failed to send to {}", recipients_display
-                );
-                return Err(Error::NoTransport);
-            }
+            Err(Error::NoTransport)
         }
-        Ok(())
     }
 }

src/sql.rs

@@ -14,7 +14,6 @@ use crate::constants::{ShowEmails, DC_CHAT_ID_TRASH};
 use crate::context::Context;
 use crate::dc_tools::*;
 use crate::ephemeral::start_ephemeral_timers;
-use crate::error::format_err;
 use crate::param::*;
 use crate::peerstate::*;
 
@@ -78,29 +77,18 @@ impl Sql {
         // drop closes the connection
     }
 
-    pub async fn open<T: AsRef<Path>>(
-        &self,
-        context: &Context,
-        dbfile: T,
-        readonly: bool,
-    ) -> crate::error::Result<()> {
-        let res = open(context, self, &dbfile, readonly).await;
-        if let Err(err) = &res {
-            match err.downcast_ref::<Error>() {
-                Some(Error::SqlAlreadyOpen) => {}
+    // return true on success, false on failure
+    pub async fn open<T: AsRef<Path>>(&self, context: &Context, dbfile: T, readonly: bool) -> bool {
+        match open(context, self, dbfile, readonly).await {
+            Ok(_) => true,
+            Err(err) => match err.downcast_ref::<Error>() {
+                Some(Error::SqlAlreadyOpen) => false,
                 _ => {
                     self.close().await;
+                    false
                 }
-            }
+            },
         }
-        res.map_err(|e| {
-            format_err!(
-                // We are using Anyhow's .context() and to show the inner error, too, we need the {:#}:
-                "Could not open db file {}: {:#}",
-                dbfile.as_ref().to_string_lossy(),
-                e
-            )
-        })
     }
 
     pub async fn execute<S: AsRef<str>>(
@@ -142,7 +130,7 @@ impl Sql {
         &self,
     ) -> Result<r2d2::PooledConnection<r2d2_sqlite::SqliteConnectionManager>> {
         let lock = self.pool.read().await;
-        let pool = lock.as_ref().ok_or(Error::SqlNoConnection)?;
+        let pool = lock.as_ref().ok_or_else(|| Error::SqlNoConnection)?;
         let conn = pool.get()?;
 
         Ok(conn)
@@ -156,7 +144,7 @@ impl Sql {
             + FnOnce(r2d2::PooledConnection<r2d2_sqlite::SqliteConnectionManager>) -> Result<H>,
     {
         let lock = self.pool.read().await;
-        let pool = lock.as_ref().ok_or(Error::SqlNoConnection)?;
+        let pool = lock.as_ref().ok_or_else(|| Error::SqlNoConnection)?;
         let conn = pool.get()?;
 
         g(conn)
@@ -168,7 +156,7 @@ impl Sql {
         Fut: Future<Output = Result<H>> + Send,
     {
         let lock = self.pool.read().await;
-        let pool = lock.as_ref().ok_or(Error::SqlNoConnection)?;
+        let pool = lock.as_ref().ok_or_else(|| Error::SqlNoConnection)?;
 
         let conn = pool.get()?;
         g(conn).await
@@ -678,10 +666,7 @@ async fn open(
         .with_flags(open_flags)
         .with_init(|c| {
             c.execute_batch(&format!(
-                "PRAGMA secure_delete=on;
-                 PRAGMA busy_timeout = {};
-                 PRAGMA temp_store=memory; -- Avoid SQLITE_IOERR_GETTEMPPATH errors on Android
-                 ",
+                "PRAGMA secure_delete=on; PRAGMA busy_timeout = {};",
                 Duration::from_secs(10).as_millis()
             ))?;
             Ok(())
@@ -708,208 +693,156 @@ async fn open(
             .ok();
 
         let mut exists_before_update = false;
-        // Init tables to dbversion=68
-        let mut dbversion_before_update: i32 = 68;
+        let mut dbversion_before_update: i32 = 0;
+        /* Init tables to dbversion=0 */
         if !sql.table_exists("config").await? {
             info!(
                 context,
                 "First time init: creating tables in {:?}.",
                 dbfile.as_ref(),
             );
-            sql.with_conn(move |mut conn| {
-                let tx = conn.transaction()?;
-                tx.execute_batch(
-                    r#"
-CREATE TABLE config (id INTEGER PRIMARY KEY, keyname TEXT, value TEXT);
-CREATE INDEX config_index1 ON config (keyname);
-CREATE TABLE contacts (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    name TEXT DEFAULT '',
-    addr TEXT DEFAULT '' COLLATE NOCASE,
-    origin INTEGER DEFAULT 0,
-    blocked INTEGER DEFAULT 0,
-    last_seen INTEGER DEFAULT 0,
-    param TEXT DEFAULT '',
-    authname TEXT DEFAULT '',
-    selfavatar_sent INTEGER DEFAULT 0
-);
-CREATE INDEX contacts_index1 ON contacts (name COLLATE NOCASE);
-CREATE INDEX contacts_index2 ON contacts (addr COLLATE NOCASE);
-INSERT INTO contacts (id,name,origin) VALUES
-(1,'self',262144), (2,'info',262144), (3,'rsvd',262144),
-(4,'rsvd',262144), (5,'device',262144), (6,'rsvd',262144),
-(7,'rsvd',262144), (8,'rsvd',262144), (9,'rsvd',262144);
-
-CREATE TABLE chats (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    type INTEGER DEFAULT 0,
-    name TEXT DEFAULT '',
-    draft_timestamp INTEGER DEFAULT 0,
-    draft_txt TEXT DEFAULT '',
-    blocked INTEGER DEFAULT 0,
-    grpid TEXT DEFAULT '',
-    param TEXT DEFAULT '',
-    archived INTEGER DEFAULT 0,
-    gossiped_timestamp INTEGER DEFAULT 0,
-    locations_send_begin INTEGER DEFAULT 0,
-    locations_send_until INTEGER DEFAULT 0,
-    locations_last_sent INTEGER DEFAULT 0,
-    created_timestamp INTEGER DEFAULT 0,
-    muted_until INTEGER DEFAULT 0,
-    ephemeral_timer INTEGER
-);
-CREATE INDEX chats_index1 ON chats (grpid);
-CREATE INDEX chats_index2 ON chats (archived);
-CREATE INDEX chats_index3 ON chats (locations_send_until);
-INSERT INTO chats (id,type,name) VALUES
-(1,120,'deaddrop'), (2,120,'rsvd'), (3,120,'trash'),
-(4,120,'msgs_in_creation'), (5,120,'starred'), (6,120,'archivedlink'),
-(7,100,'rsvd'), (8,100,'rsvd'), (9,100,'rsvd');
-
-CREATE TABLE chats_contacts (chat_id INTEGER, contact_id INTEGER);
-CREATE INDEX chats_contacts_index1 ON chats_contacts (chat_id);
-CREATE INDEX chats_contacts_index2 ON chats_contacts (contact_id);
-
-CREATE TABLE msgs (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    rfc724_mid TEXT DEFAULT '',
-    server_folder TEXT DEFAULT '',
-    server_uid INTEGER DEFAULT 0,
-    chat_id INTEGER DEFAULT 0,
-    from_id INTEGER DEFAULT 0,
-    to_id INTEGER DEFAULT 0,
-    timestamp INTEGER DEFAULT 0,
-    type INTEGER DEFAULT 0,
-    state INTEGER DEFAULT 0,
-    msgrmsg INTEGER DEFAULT 1,
-    bytes INTEGER DEFAULT 0,
-    txt TEXT DEFAULT '',
-    txt_raw TEXT DEFAULT '',
-    param TEXT DEFAULT '',
-    starred INTEGER DEFAULT 0,
-    timestamp_sent INTEGER DEFAULT 0,
-    timestamp_rcvd INTEGER DEFAULT 0,
-    hidden INTEGER DEFAULT 0,
-    mime_headers TEXT,
-    mime_in_reply_to TEXT,
-    mime_references TEXT,
-    move_state INTEGER DEFAULT 1,
-    location_id INTEGER DEFAULT 0,
-    error TEXT DEFAULT '',
-
--- Timer value in seconds. For incoming messages this
--- timer starts when message is read, so we want to have
--- the value stored here until the timer starts.
-    ephemeral_timer INTEGER DEFAULT 0,
-
--- Timestamp indicating when the message should be
--- deleted. It is convenient to store it here because UI
--- needs this value to display how much time is left until
--- the message is deleted.
-    ephemeral_timestamp INTEGER DEFAULT 0
-);
-
-CREATE INDEX msgs_index1 ON msgs (rfc724_mid);
-CREATE INDEX msgs_index2 ON msgs (chat_id);
-CREATE INDEX msgs_index3 ON msgs (timestamp);
-CREATE INDEX msgs_index4 ON msgs (state);
-CREATE INDEX msgs_index5 ON msgs (starred);
-CREATE INDEX msgs_index6 ON msgs (location_id);
-CREATE INDEX msgs_index7 ON msgs (state, hidden, chat_id);
-INSERT INTO msgs (id,msgrmsg,txt) VALUES
-(1,0,'marker1'), (2,0,'rsvd'), (3,0,'rsvd'),
-(4,0,'rsvd'), (5,0,'rsvd'), (6,0,'rsvd'), (7,0,'rsvd'),
-(8,0,'rsvd'), (9,0,'daymarker');
-
-CREATE TABLE jobs (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    added_timestamp INTEGER,
-    desired_timestamp INTEGER DEFAULT 0,
-    action INTEGER,
-    foreign_id INTEGER,
-    param TEXT DEFAULT '',
-    thread INTEGER DEFAULT 0,
-    tries INTEGER DEFAULT 0
-);
-CREATE INDEX jobs_index1 ON jobs (desired_timestamp);
-
-CREATE TABLE leftgrps (
-    id INTEGER PRIMARY KEY,
-    grpid TEXT DEFAULT ''
-);
-CREATE INDEX leftgrps_index1 ON leftgrps (grpid);
-
-CREATE TABLE keypairs (
-    id INTEGER PRIMARY KEY,
-    addr TEXT DEFAULT '' COLLATE NOCASE,
-    is_default INTEGER DEFAULT 0,
-    private_key,
-    public_key,
-    created INTEGER DEFAULT 0
-);
-
-CREATE TABLE acpeerstates (
-    id INTEGER PRIMARY KEY,
-    addr TEXT DEFAULT '' COLLATE NOCASE,
-    last_seen INTEGER DEFAULT 0,
-    last_seen_autocrypt INTEGER DEFAULT 0,
-    public_key,
-    prefer_encrypted INTEGER DEFAULT 0,
-    gossip_timestamp INTEGER DEFAULT 0,
-    gossip_key,
-    public_key_fingerprint TEXT DEFAULT '',
-    gossip_key_fingerprint TEXT DEFAULT '',
-    verified_key,
-    verified_key_fingerprint TEXT DEFAULT ''
-);
-CREATE INDEX acpeerstates_index1 ON acpeerstates (addr);
-CREATE INDEX acpeerstates_index3 ON acpeerstates (public_key_fingerprint);
-CREATE INDEX acpeerstates_index4 ON acpeerstates (gossip_key_fingerprint);
-CREATE INDEX acpeerstates_index5 ON acpeerstates (verified_key_fingerprint);
-
-CREATE TABLE msgs_mdns (
-    msg_id INTEGER,
-    contact_id INTEGER,
-    timestamp_sent INTEGER DEFAULT 0
-);
-CREATE INDEX msgs_mdns_index1 ON msgs_mdns (msg_id);
-
-CREATE TABLE tokens (
-    id INTEGER PRIMARY KEY,
-    namespc INTEGER DEFAULT 0,
-    foreign_id INTEGER DEFAULT 0,
-    token TEXT DEFAULT '',
-    timestamp INTEGER DEFAULT 0
-);
-
-CREATE TABLE locations (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    latitude REAL DEFAULT 0.0,
-    longitude REAL DEFAULT 0.0,
-    accuracy REAL DEFAULT 0.0,
-    timestamp INTEGER DEFAULT 0,
-    chat_id INTEGER DEFAULT 0,
-    from_id INTEGER DEFAULT 0,
-    independent INTEGER DEFAULT 0
-);
-CREATE INDEX locations_index1 ON locations (from_id);
-CREATE INDEX locations_index2 ON locations (timestamp);
-
-CREATE TABLE devmsglabels (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    label TEXT,
-    msg_id INTEGER DEFAULT 0
-);
-CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
-"#,
-                )?;
-                tx.commit()?;
-                Ok(())
-            })
+            sql.execute(
+                "CREATE TABLE config (id INTEGER PRIMARY KEY, keyname TEXT, value TEXT);",
+                paramsv![],
+            )
             .await?;
-
-            sql.set_raw_config_int(context, "dbversion", dbversion_before_update)
+            sql.execute(
+                "CREATE INDEX config_index1 ON config (keyname);",
+                paramsv![],
+            )
+            .await?;
+            sql.execute(
+                "CREATE TABLE contacts (\
+                 id INTEGER PRIMARY KEY AUTOINCREMENT, \
+                 name TEXT DEFAULT '', \
+                 addr TEXT DEFAULT '' COLLATE NOCASE, \
+                 origin INTEGER DEFAULT 0, \
+                 blocked INTEGER DEFAULT 0, \
+                 last_seen INTEGER DEFAULT 0, \
+                 param TEXT DEFAULT '');",
+                paramsv![],
+            )
+            .await?;
+            sql.execute(
+                "CREATE INDEX contacts_index1 ON contacts (name COLLATE NOCASE);",
+                paramsv![],
+            )
+            .await?;
+            sql.execute(
+                "CREATE INDEX contacts_index2 ON contacts (addr COLLATE NOCASE);",
+                paramsv![],
+            )
+            .await?;
+            sql.execute(
+                "INSERT INTO contacts (id,name,origin) VALUES \
+                 (1,'self',262144), (2,'info',262144), (3,'rsvd',262144), \
+                 (4,'rsvd',262144), (5,'device',262144), (6,'rsvd',262144), \
+                 (7,'rsvd',262144), (8,'rsvd',262144), (9,'rsvd',262144);",
+                paramsv![],
+            )
+            .await?;
+            sql.execute(
+                "CREATE TABLE chats (\
+                 id INTEGER PRIMARY KEY AUTOINCREMENT,  \
+                 type INTEGER DEFAULT 0, \
+                 name TEXT DEFAULT '', \
+                 draft_timestamp INTEGER DEFAULT 0, \
+                 draft_txt TEXT DEFAULT '', \
+                 blocked INTEGER DEFAULT 0, \
+                 grpid TEXT DEFAULT '', \
+                 param TEXT DEFAULT '');",
+                paramsv![],
+            )
+            .await?;
+            sql.execute("CREATE INDEX chats_index1 ON chats (grpid);", paramsv![])
                 .await?;
+            sql.execute(
+                "CREATE TABLE chats_contacts (chat_id INTEGER, contact_id INTEGER);",
+                paramsv![],
+            )
+            .await?;
+            sql.execute(
+                "CREATE INDEX chats_contacts_index1 ON chats_contacts (chat_id);",
+                paramsv![],
+            )
+            .await?;
+            sql.execute(
+                "INSERT INTO chats (id,type,name) VALUES \
+                 (1,120,'deaddrop'), (2,120,'rsvd'), (3,120,'trash'), \
+                 (4,120,'msgs_in_creation'), (5,120,'starred'), (6,120,'archivedlink'), \
+                 (7,100,'rsvd'), (8,100,'rsvd'), (9,100,'rsvd');",
+                paramsv![],
+            )
+            .await?;
+            sql.execute(
+                "CREATE TABLE msgs (\
+                 id INTEGER PRIMARY KEY AUTOINCREMENT, \
+                 rfc724_mid TEXT DEFAULT '', \
+                 server_folder TEXT DEFAULT '', \
+                 server_uid INTEGER DEFAULT 0, \
+                 chat_id INTEGER DEFAULT 0, \
+                 from_id INTEGER DEFAULT 0, \
+                 to_id INTEGER DEFAULT 0, \
+                 timestamp INTEGER DEFAULT 0, \
+                 type INTEGER DEFAULT 0, \
+                 state INTEGER DEFAULT 0, \
+                 msgrmsg INTEGER DEFAULT 1, \
+                 bytes INTEGER DEFAULT 0, \
+                 txt TEXT DEFAULT '', \
+                 txt_raw TEXT DEFAULT '', \
+                 param TEXT DEFAULT '');",
+                paramsv![],
+            )
+            .await?;
+            sql.execute("CREATE INDEX msgs_index1 ON msgs (rfc724_mid);", paramsv![])
+                .await?;
+            sql.execute("CREATE INDEX msgs_index2 ON msgs (chat_id);", paramsv![])
+                .await?;
+            sql.execute("CREATE INDEX msgs_index3 ON msgs (timestamp);", paramsv![])
+                .await?;
+            sql.execute("CREATE INDEX msgs_index4 ON msgs (state);", paramsv![])
+                .await?;
+            sql.execute(
+                "INSERT INTO msgs (id,msgrmsg,txt) VALUES \
+                 (1,0,'marker1'), (2,0,'rsvd'), (3,0,'rsvd'), \
+                 (4,0,'rsvd'), (5,0,'rsvd'), (6,0,'rsvd'), (7,0,'rsvd'), \
+                 (8,0,'rsvd'), (9,0,'daymarker');",
+                paramsv![],
+            )
+            .await?;
+            sql.execute(
+                "CREATE TABLE jobs (\
+                 id INTEGER PRIMARY KEY AUTOINCREMENT, \
+                 added_timestamp INTEGER, \
+                 desired_timestamp INTEGER DEFAULT 0, \
+                 action INTEGER, \
+                 foreign_id INTEGER, \
+                 param TEXT DEFAULT '');",
+                paramsv![],
+            )
+            .await?;
+            sql.execute(
+                "CREATE INDEX jobs_index1 ON jobs (desired_timestamp);",
+                paramsv![],
+            )
+            .await?;
+            if !sql.table_exists("config").await?
+                || !sql.table_exists("contacts").await?
+                || !sql.table_exists("chats").await?
+                || !sql.table_exists("chats_contacts").await?
+                || !sql.table_exists("msgs").await?
+                || !sql.table_exists("jobs").await?
+            {
+                error!(
+                    context,
+                    "Cannot create tables in new database \"{:?}\".",
+                    dbfile.as_ref(),
+                );
+                // cannot create the tables - maybe we cannot write?
+                return Err(Error::SqlFailedToOpen.into());
+            } else {
+                sql.set_raw_config_int(context, "dbversion", 0).await?;
+            }
         } else {
             exists_before_update = true;
             dbversion_before_update = sql
@@ -925,7 +858,7 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
 
         let mut dbversion = dbversion_before_update;
         let mut recalc_fingerprints = false;
-        let mut update_icons = !exists_before_update;
+        let mut update_icons = false;
 
         if dbversion < 1 {
             info!(context, "[migration] v1");
@@ -939,6 +872,7 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
                 paramsv![],
             )
             .await?;
+            dbversion = 1;
             sql.set_raw_config_int(context, "dbversion", 1).await?;
         }
         if dbversion < 2 {
@@ -948,6 +882,7 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
                 paramsv![],
             )
             .await?;
+            dbversion = 2;
             sql.set_raw_config_int(context, "dbversion", 2).await?;
         }
         if dbversion < 7 {
@@ -963,6 +898,7 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
                 paramsv![],
             )
             .await?;
+            dbversion = 7;
             sql.set_raw_config_int(context, "dbversion", 7).await?;
         }
         if dbversion < 10 {
@@ -983,6 +919,7 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
                 paramsv![],
             )
             .await?;
+            dbversion = 10;
             sql.set_raw_config_int(context, "dbversion", 10).await?;
         }
         if dbversion < 12 {
@@ -997,6 +934,7 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
                 paramsv![],
             )
             .await?;
+            dbversion = 12;
             sql.set_raw_config_int(context, "dbversion", 12).await?;
         }
         if dbversion < 17 {
@@ -1008,8 +946,6 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
             .await?;
             sql.execute("CREATE INDEX chats_index2 ON chats (archived);", paramsv![])
                 .await?;
-            // 'starred' column is not used currently
-            // (dropping is not easily doable and stop adding it will make reusing it complicated)
             sql.execute(
                 "ALTER TABLE msgs ADD COLUMN starred INTEGER DEFAULT 0;",
                 paramsv![],
@@ -1017,6 +953,7 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
             .await?;
             sql.execute("CREATE INDEX msgs_index5 ON msgs (starred);", paramsv![])
                 .await?;
+            dbversion = 17;
             sql.set_raw_config_int(context, "dbversion", 17).await?;
         }
         if dbversion < 18 {
@@ -1031,6 +968,7 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
                 paramsv![],
             )
             .await?;
+            dbversion = 18;
             sql.set_raw_config_int(context, "dbversion", 18).await?;
         }
         if dbversion < 27 {
@@ -1054,6 +992,7 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
                 paramsv![],
             )
             .await?;
+            dbversion = 27;
             sql.set_raw_config_int(context, "dbversion", 27).await?;
         }
         if dbversion < 34 {
@@ -1089,6 +1028,7 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
             )
             .await?;
             recalc_fingerprints = true;
+            dbversion = 34;
             sql.set_raw_config_int(context, "dbversion", 34).await?;
         }
         if dbversion < 39 {
@@ -1112,6 +1052,7 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
                 paramsv![],
             )
             .await?;
+            dbversion = 39;
             sql.set_raw_config_int(context, "dbversion", 39).await?;
         }
         if dbversion < 40 {
@@ -1121,12 +1062,14 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
                 paramsv![],
             )
             .await?;
+            dbversion = 40;
             sql.set_raw_config_int(context, "dbversion", 40).await?;
         }
         if dbversion < 44 {
             info!(context, "[migration] v44");
             sql.execute("ALTER TABLE msgs ADD COLUMN mime_headers TEXT;", paramsv![])
                 .await?;
+            dbversion = 44;
             sql.set_raw_config_int(context, "dbversion", 44).await?;
         }
         if dbversion < 46 {
@@ -1151,6 +1094,7 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
                 paramsv![],
             )
             .await?;
+            dbversion = 47;
             sql.set_raw_config_int(context, "dbversion", 47).await?;
         }
         if dbversion < 48 {
@@ -1161,6 +1105,8 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
                 paramsv![],
             )
             .await?;
+
+            dbversion = 48;
             sql.set_raw_config_int(context, "dbversion", 48).await?;
         }
         if dbversion < 49 {
@@ -1170,6 +1116,7 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
                 paramsv![],
             )
             .await?;
+            dbversion = 49;
             sql.set_raw_config_int(context, "dbversion", 49).await?;
         }
         if dbversion < 50 {
@@ -1181,6 +1128,7 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
                 sql.set_raw_config_int(context, "show_emails", ShowEmails::All as i32)
                     .await?;
             }
+            dbversion = 50;
             sql.set_raw_config_int(context, "dbversion", 50).await?;
         }
         if dbversion < 53 {
@@ -1221,6 +1169,7 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
                 paramsv![],
             )
             .await?;
+            dbversion = 53;
             sql.set_raw_config_int(context, "dbversion", 53).await?;
         }
         if dbversion < 54 {
@@ -1235,6 +1184,7 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
                 paramsv![],
             )
             .await?;
+            dbversion = 54;
             sql.set_raw_config_int(context, "dbversion", 54).await?;
         }
         if dbversion < 55 {
@@ -1314,11 +1264,18 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
                 paramsv![],
             )
             .await?;
+            // Timer value in seconds. For incoming messages this
+            // timer starts when message is read, so we want to have
+            // the value stored here until the timer starts.
             sql.execute(
                 "ALTER TABLE msgs ADD COLUMN ephemeral_timer INTEGER DEFAULT 0",
                 paramsv![],
             )
             .await?;
+            // Timestamp indicating when the message should be
+            // deleted. It is convenient to store it here because UI
+            // needs this value to display how much time is left until
+            // the message is deleted.
             sql.execute(
                 "ALTER TABLE msgs ADD COLUMN ephemeral_timestamp INTEGER DEFAULT 0",
                 paramsv![],
@@ -1360,7 +1317,7 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
         }
         if dbversion < 68 {
             info!(context, "[migration] v68");
-            // the index is used to speed up get_fresh_msg_cnt() (see comment there for more details) and marknoticed_chat()
+            // the index is used to speed up get_fresh_msg_cnt(), see comment there for more details
             sql.execute(
                 "CREATE INDEX IF NOT EXISTS msgs_index7 ON msgs (state, hidden, chat_id);",
                 paramsv![],
@@ -1368,20 +1325,6 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
             .await?;
             sql.set_raw_config_int(context, "dbversion", 68).await?;
         }
-        if dbversion < 69 {
-            info!(context, "[migration] v69");
-            sql.execute(
-                "ALTER TABLE chats ADD COLUMN protected INTEGER DEFAULT 0;",
-                paramsv![],
-            )
-            .await?;
-            sql.execute(
-                "UPDATE chats SET protected=1, type=120 WHERE type=130;", // 120=group, 130=old verified group
-                paramsv![],
-            )
-            .await?;
-            sql.set_raw_config_int(context, "dbversion", 69).await?;
-        }
 
         // (2) updates that require high-level objects
         // (the structure is complete now and all objects are usable)

src/stock.rs

@@ -5,8 +5,8 @@ use std::borrow::Cow;
 use strum::EnumProperty;
 use strum_macros::EnumProperty;
 
+use crate::blob::BlobObject;
 use crate::chat;
-use crate::chat::ProtectionStatus;
 use crate::constants::{Viewtype, DC_CONTACT_ID_SELF};
 use crate::contact::*;
 use crate::context::Context;
@@ -14,7 +14,6 @@ use crate::error::{bail, Error};
 use crate::message::Message;
 use crate::param::Param;
 use crate::stock::StockMessage::{DeviceMessagesHint, WelcomeMessage};
-use crate::{blob::BlobObject, config::Config};
 
 /// Stock strings
 ///
@@ -120,6 +119,9 @@ pub enum StockMessage {
     #[strum(props(fallback = "Archived chats"))]
     ArchivedChats = 40,
 
+    #[strum(props(fallback = "Starred messages"))]
+    StarredMsgs = 41,
+
     #[strum(props(fallback = "Autocrypt Setup Message"))]
     AcSetupMsgSubject = 42,
 
@@ -215,39 +217,8 @@ pub enum StockMessage {
     #[strum(props(fallback = "You are invited to a video chat, click %1$s to join."))]
     VideochatInviteMsgBody = 83,
 
-    #[strum(props(fallback = "Error:\n\n“%1$s”"))]
+    #[strum(props(fallback = "Configuration failed. Error: “%1$s”"))]
     ConfigurationFailed = 84,
-
-    #[strum(props(
-        fallback = "⚠️ Date or time of your device seem to be inaccurate (%1$s).\n\n\
-                    Adjust your clock ⏰🔧 to ensure your messages are received correctly."
-    ))]
-    BadTimeMsgBody = 85,
-
-    #[strum(props(fallback = "⚠️ Your Delta Chat version might be outdated.\n\n\
-                    This may cause problems because your chat partners use newer versions - \
-                    and you are missing the latest features 😳\n\
-                    Please check https://get.delta.chat or your app store for updates."))]
-    UpdateReminderMsgBody = 86,
-
-    #[strum(props(
-        fallback = "Could not find your mail server.\n\nPlease check your internet connection."
-    ))]
-    ErrorNoNetwork = 87,
-
-    #[strum(props(fallback = "Chat protection enabled."))]
-    ProtectionEnabled = 88,
-
-    #[strum(props(fallback = "Chat protection disabled."))]
-    ProtectionDisabled = 89,
-
-    // used in summaries, a noun, not a verb (not: "to reply")
-    #[strum(props(fallback = "Reply"))]
-    ReplyNoun = 90,
-
-    #[strum(props(fallback = "You deleted the \"Saved messages\" chat.\n\n\
-                    To use the \"Saved messages\" feature again, create a new chat with yourself."))]
-    SelfDeletedMsgBody = 91,
 }
 
 /*
@@ -413,27 +384,16 @@ impl Context {
         }
     }
 
-    /// Returns a stock message saying that protection status has changed.
-    pub async fn stock_protection_msg(&self, protect: ProtectionStatus, from_id: u32) -> String {
-        self.stock_system_msg(
-            match protect {
-                ProtectionStatus::Protected => StockMessage::ProtectionEnabled,
-                ProtectionStatus::Unprotected => StockMessage::ProtectionDisabled,
-            },
-            "",
-            "",
-            from_id,
-        )
-        .await
-    }
-
-    pub(crate) async fn update_device_chats(&self) -> Result<(), Error> {
-        if self.get_config_bool(Config::Bot).await {
+    pub async fn update_device_chats(&self) -> Result<(), Error> {
+        // check for the LAST added device message - if it is present, we can skip message creation.
+        // this is worthwhile as this function is typically called
+        // by the ui on every probram start or even on every opening of the chatlist.
+        if chat::was_device_msg_ever_added(&self, "core-welcome").await? {
             return Ok(());
         }
 
-        // create saved-messages chat; we do this only once, if the user has deleted the chat,
-        // he can recreate it manually (make sure we do not re-add it when configure() was called a second time)
+        // create saved-messages chat;
+        // we do this only once, if the user has deleted the chat, he can recreate it manually.
         if !self.sql.get_raw_config_bool(&self, "self-chat-added").await {
             self.sql
                 .set_raw_config_bool(&self, "self-chat-added", true)
@@ -467,7 +427,6 @@ mod tests {
 
     use crate::constants::DC_CONTACT_ID_SELF;
 
-    use crate::chat::Chat;
     use crate::chatlist::Chatlist;
     use num_traits::ToPrimitive;
 
@@ -659,31 +618,8 @@ mod tests {
         let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
         assert_eq!(chats.len(), 2);
 
-        let chat0 = Chat::load_from_db(&t.ctx, chats.get_chat_id(0))
-            .await
-            .unwrap();
-        let (self_talk_id, device_chat_id) = if chat0.is_self_talk() {
-            (chats.get_chat_id(0), chats.get_chat_id(1))
-        } else {
-            (chats.get_chat_id(1), chats.get_chat_id(0))
-        };
-
-        // delete self-talk first; this adds a message to device-chat about how self-talk can be restored
-        let device_chat_msgs_before = chat::get_chat_msgs(&t.ctx, device_chat_id, 0, None)
-            .await
-            .len();
-        self_talk_id.delete(&t.ctx).await.ok();
-        assert_eq!(
-            chat::get_chat_msgs(&t.ctx, device_chat_id, 0, None)
-                .await
-                .len(),
-            device_chat_msgs_before + 1
-        );
-
-        // delete device chat
-        device_chat_id.delete(&t.ctx).await.ok();
-
-        // check, that the chatlist is empty
+        chats.get_chat_id(0).delete(&t.ctx).await.ok();
+        chats.get_chat_id(1).delete(&t.ctx).await.ok();
         let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
         assert_eq!(chats.len(), 0);
 

src/test_utils.rs

@@ -9,15 +9,13 @@ use async_std::path::PathBuf;
 use async_std::sync::RwLock;
 use tempfile::{tempdir, TempDir};
 
-use crate::chat;
-use crate::chat::{ChatId, ChatItem};
+use crate::chat::ChatId;
 use crate::config::Config;
 use crate::context::Context;
 use crate::dc_receive_imf::dc_receive_imf;
 use crate::dc_tools::EmailAddress;
 use crate::job::Action;
 use crate::key::{self, DcKey};
-use crate::message::Message;
 use crate::mimeparser::MimeMessage;
 use crate::param::{Param, Params};
 
@@ -189,19 +187,6 @@ impl TestContext {
             .await
             .unwrap();
     }
-
-    /// Get the most recent message of a chat.
-    ///
-    /// Panics on errors or if the most recent message is a marker.
-    pub async fn get_last_msg(&self, chat_id: ChatId) -> Message {
-        let msgs = chat::get_chat_msgs(&self.ctx, chat_id, 0, None).await;
-        let msg_id = if let ChatItem::Message { msg_id } = msgs.last().unwrap() {
-            msg_id
-        } else {
-            panic!("Wrong item type");
-        };
-        Message::load_from_db(&self.ctx, *msg_id).await.unwrap()
-    }
 }
 
 /// A raw message as it was scheduled to be sent.

test-data/message/quote_attach.eml

@@ -1,27 +0,0 @@
-Subject: Message from Alice
-MIME-Version: 1.0
-In-Reply-To: <Mr.7h_HyOuM3Dz.xcp4v8QiQua@testrun.org>
-Date: Sun, 08 Nov 2020 01:16:26 +0000
-Chat-Version: 1.0
-Message-ID: <Mr.126R7OsBKvk.dGGBC5WcsLF@testrun.org>
-To: Bob <bob@example.org>
-From: Alice <alice@testrun.org>
-Content-Type: multipart/mixed; boundary="uWbWY2IyEtJ8wZmp282Na11hxBBXlV"
-
-
---uWbWY2IyEtJ8wZmp282Na11hxBBXlV
-Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
-
-> Quote
-
-Reply
-
---uWbWY2IyEtJ8wZmp282Na11hxBBXlV
-Content-Type: text/plain
-Content-Disposition: attachment; filename="attachment.txt"
-Content-Transfer-Encoding: base64
-
-ZGF0YSB0byBzZW5k
-
---uWbWY2IyEtJ8wZmp282Na11hxBBXlV--
-

test-data/message/vcard.eml

@@ -1,38 +0,0 @@
-Return-Path: <alice@example.org>
-Delivered-To: bob@example.org
-To: bob@example.org
-From: Alice <alice@example.org>
-Subject: vCard example
-Message-ID: <foobar@example.org>
-Date: Sun, 22 Nov 2020 22:44:00 +0000
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
- Thunderbird/78.4.3
-MIME-Version: 1.0
-Content-Type: multipart/mixed;
- boundary="------------01973B3475205164D5F9F507"
-Content-Language: en-US
-
-This is a multi-part message in MIME format.
---------------01973B3475205164D5F9F507
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 7bit
-
-An example of vCard sent from Thunderbird.
-
---------------01973B3475205164D5F9F507
-Content-Type: text/x-vcard; charset=utf-8;
- name="alice.vcf"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment;
- filename="alice.vcf"
-
-begin:vcard
-fn:Alice Foobar
-n:Foobar;Alice
-email;internet:alice@example.org
-x-mozilla-html:FALSE
-version:2.1
-end:vcard
-
-
---------------01973B3475205164D5F9F507--

tests/stress.rs

@@ -0,0 +1,110 @@
+//! Stress some functions for testing; if used as a lib, this file is obsolete.
+
+use deltachat::config;
+use deltachat::context::*;
+use tempfile::tempdir;
+
+/* some data used for testing
+ ******************************************************************************/
+
+async fn stress_functions(context: &Context) {
+    let res = context
+        .get_config(config::Config::SysConfigKeys)
+        .await
+        .unwrap();
+
+    assert!(!res.contains(" probably_never_a_key "));
+    assert!(res.contains(" addr "));
+    assert!(res.contains(" mail_server "));
+    assert!(res.contains(" mail_user "));
+    assert!(res.contains(" mail_pw "));
+    assert!(res.contains(" mail_port "));
+    assert!(res.contains(" send_server "));
+    assert!(res.contains(" send_user "));
+    assert!(res.contains(" send_pw "));
+    assert!(res.contains(" send_port "));
+    assert!(res.contains(" server_flags "));
+    assert!(res.contains(" imap_folder "));
+    assert!(res.contains(" displayname "));
+    assert!(res.contains(" selfstatus "));
+    assert!(res.contains(" selfavatar "));
+    assert!(res.contains(" e2ee_enabled "));
+    assert!(res.contains(" mdns_enabled "));
+    assert!(res.contains(" save_mime_headers "));
+    assert!(res.contains(" configured_addr "));
+    assert!(res.contains(" configured_mail_server "));
+    assert!(res.contains(" configured_mail_user "));
+    assert!(res.contains(" configured_mail_pw "));
+    assert!(res.contains(" configured_mail_port "));
+    assert!(res.contains(" configured_send_server "));
+    assert!(res.contains(" configured_send_user "));
+    assert!(res.contains(" configured_send_pw "));
+    assert!(res.contains(" configured_send_port "));
+    assert!(res.contains(" configured_server_flags "));
+
+    // Cant check, no configured context
+    // assert!(dc_is_configured(context) != 0, "Missing configured context");
+
+    // let setupcode = dc_create_setup_code(context);
+    // let setupcode_c = CString::new(setupcode.clone()).unwrap();
+    // let setupfile = dc_render_setup_file(context, &setupcode).unwrap();
+    // let setupfile_c = CString::new(setupfile).unwrap();
+    // let mut headerline_2: *const libc::c_char = ptr::null();
+    // let payload = dc_decrypt_setup_file(context, setupcode_c.as_ptr(), setupfile_c.as_ptr());
+
+    // assert!(payload.is_null());
+    // assert!(!dc_split_armored_data(
+    //     payload,
+    //     &mut headerline_2,
+    //     ptr::null_mut(),
+    //     ptr::null_mut(),
+    //     ptr::null_mut(),
+    // ));
+    // assert!(!headerline_2.is_null());
+    // assert_eq!(
+    //     strcmp(
+    //         headerline_2,
+    //         b"-----BEGIN PGP PRIVATE KEY BLOCK-----\x00" as *const u8 as *const libc::c_char,
+    //     ),
+    //     0
+    // );
+    // free(payload as *mut libc::c_void);
+
+    // Cant check, no configured context
+    // assert!(dc_is_configured(context) != 0, "missing configured context");
+
+    // let qr = dc_get_securejoin_qr(context, 0);
+    // assert!(!qr.is_null(), "Invalid qr code generated");
+    // let qr_r = as_str(qr);
+
+    // assert!(qr_r.len() > 55);
+    // assert!(qr_r.starts_with("OPENPGP4FPR:"));
+
+    // let res = dc_check_qr(context, qr);
+    // let s = res.get_state();
+
+    // assert!(
+    //     s == QrState::AskVerifyContact
+    //         || s == QrState::FprMissmatch
+    //         || s == QrState::FprWithoutAddr
+    // );
+
+    // free(qr.cast());
+}
+
+async fn create_test_context() -> Context {
+    use rand::Rng;
+
+    let dir = tempdir().unwrap();
+    let dbfile = dir.path().join("db.sqlite");
+    let id = rand::thread_rng().gen();
+    Context::new("FakeOs".into(), dbfile.into(), id)
+        .await
+        .unwrap()
+}
+
+#[async_std::test]
+async fn test_stress_tests() {
+    let context = create_test_context().await;
+    stress_functions(&context).await;
+}