with these lines commented out, it works

.github/workflows/rust.yml

@@ -1,15 +0,0 @@
-name: Rust
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Build
-      run: cargo build --verbose
-    - name: Run tests
-      run: cargo test --verbose

Cargo.lock

@@ -496,7 +496,6 @@ dependencies = [
  "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "image-meta 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "imap 1.0.2 (git+https://github.com/deltachat/rust-imap)",
- "indoc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "jetscii 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1034,27 +1033,6 @@ dependencies = [
  "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "indoc"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "indoc-impl 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "indoc-impl"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "unindent 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "iovec"
 version = "0.1.4"
@@ -1603,16 +1581,6 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "0.4.30"
@@ -2621,11 +2589,6 @@ name = "unicode-xid"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "unindent"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "unsafe-any"
 version = "0.4.2"
@@ -2954,8 +2917,6 @@ dependencies = [
 "checksum imap 1.0.2 (git+https://github.com/deltachat/rust-imap)" = "<none>"
 "checksum imap-proto 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b92ca529b24c5f80a950abe993d3883df6fe6791d4a46b1fda1eb339796c589"
 "checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2"
-"checksum indoc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3f9553c1e16c114b8b77ebeb329e5f2876eed62a8d51178c8bc6bff0d65f98f8"
-"checksum indoc-impl 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b714fc08d0961716390977cdff1536234415ac37b509e34e5a983def8340fb75"
 "checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
 "checksum itertools 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "87fa75c9dea7b07be3138c49abbb83fd4bea199b5cdc76f9804458edc5da0d6e"
 "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
@@ -3013,7 +2974,6 @@ dependencies = [
 "checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
 "checksum pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3f81e1644e1b54f5a68959a29aa86cde704219254669da328ecfdf6a1f09d427"
 "checksum pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074"
-"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
 "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
 "checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
 "checksum proptest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cf147e022eacf0c8a054ab864914a7602618adba841d800a9a9868a5237a529f"
@@ -3123,7 +3083,6 @@ dependencies = [
 "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
-"checksum unindent 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "63f18aa3b0e35fed5a0048f029558b1518095ffe2a0a31fb87c93dece93a4993"
 "checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f"
 "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
 "checksum url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61"

Cargo.toml

@@ -49,7 +49,6 @@ bitflags = "1.1.0"
 jetscii = "0.4.4"
 debug_stub_derive = "0.3.0"
 sanitize-filename = "0.2.1"
-indoc = "0.3"
 
 [dev-dependencies]
 tempfile = "3.0"

deltachat-ffi/deltachat.h

@@ -501,9 +501,15 @@ char*           dc_get_oauth2_url            (dc_context_t* context, const char*
  * To interrupt a configuration prematurely, use dc_stop_ongoing_process();
  * this is not needed if #DC_EVENT_CONFIGURE_PROGRESS reports success.
  *
- * If #DC_EVENT_CONFIGURE_PROGRESS reports failure,
- * the core continues to use the last working configuration
- * and parameters as `addr`, `mail_pw` etc. are set to that.
+ * On a successfull configuration,
+ * the core makes a copy of the parameters mentioned above:
+ * the original parameters as are never modified by the core.
+ *
+ * UI-implementors should keep this in mind -
+ * eg. if the UI wants to prefill a configure-edit-dialog with these parameters,
+ * the UI should reset them if the user cancels the dialog
+ * after a configure-attempts has failed.
+ * Otherwise the parameters may not reflect the current configuation.
  *
  * @memberof dc_context_t
  * @param context The context object as created by dc_context_new().
@@ -1113,28 +1119,6 @@ void            dc_set_draft                 (dc_context_t* context, uint32_t ch
 uint32_t        dc_add_device_msg            (dc_context_t* context, dc_msg_t* msg);
 
 
-/**
- * Add a message only one time to the device-chat.
- * The device-message is defined by a name.
- * If a message with the same name was added before,
- * the message is not added again.
- * Use dc_add_device_msg() to add device-messages unconditionally.
- *
- * Sends the event #DC_EVENT_MSGS_CHANGED on success.
- *
- * @memberof dc_context_t
- * @param context The context as created by dc_context_new().
- * @param label A unique name for the message to add.
- *     The label is typically not displayed to the user and
- *     must be created from the characters `A-Z`, `a-z`, `0-9`, `_` or `-`.
- * @param msg Message to be added to the device-chat.
- *     The message appears to the user as an incoming message.
- * @return The ID of the added message,
- *     this might be the id of an older message with the same name.
- */
-uint32_t        dc_add_device_msg_once       (dc_context_t* context, const char* label, dc_msg_t* msg);
-
-
 /**
  * Get draft for a chat, if any.
  * See dc_set_draft() for more details about drafts.
@@ -4489,8 +4473,7 @@ void            dc_array_add_id              (dc_array_t*, uint32_t); // depreca
 #define DC_STR_MSGLOCATIONDISABLED        65
 #define DC_STR_LOCATION                   66
 #define DC_STR_STICKER                    67
-#define DC_STR_DEVICE_MESSAGES            68
-#define DC_STR_COUNT                      68
+#define DC_STR_COUNT                      67
 
 /*
  * @}

deltachat-ffi/src/lib.rs

@@ -828,27 +828,6 @@ pub unsafe extern "C" fn dc_add_device_msg(context: *mut dc_context_t, msg: *mut
         .unwrap_or(0)
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_add_device_msg_once(
-    context: *mut dc_context_t,
-    label: *const libc::c_char,
-    msg: *mut dc_msg_t,
-) -> u32 {
-    if context.is_null() || label.is_null() || msg.is_null() {
-        eprintln!("ignoring careless call to dc_add_device_msg_once()");
-        return 0;
-    }
-    let ffi_context = &mut *context;
-    let ffi_msg = &mut *msg;
-    ffi_context
-        .with_inner(|ctx| {
-            chat::add_device_msg_once(ctx, &to_string_lossy(label), &mut ffi_msg.message)
-                .unwrap_or_log_default(ctx, "Failed to add device message once")
-        })
-        .map(|msg_id| msg_id.to_u32())
-        .unwrap_or(0)
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_get_draft(context: *mut dc_context_t, chat_id: u32) -> *mut dc_msg_t {
     if context.is_null() {

examples/repl/cmdline.rs

@@ -192,7 +192,7 @@ unsafe fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
     let msgtext = msg.get_text();
     info!(
         context,
-        "{}{}{}{}: {} (Contact#{}): {} {}{}{}{}{} [{}]",
+        "{}#{}{}{}: {} (Contact#{}): {} {}{}{}{}{} [{}]",
         prefix.as_ref(),
         msg.get_id(),
         if msg.get_showpadlock() { "🔒" } else { "" },
@@ -240,7 +240,7 @@ unsafe fn log_msglist(context: &Context, msglist: &Vec<MsgId>) -> Result<(), Err
                 lines_out += 1
             }
             let msg = Message::load_from_db(context, msg_id)?;
-            log_msg(context, "", &msg);
+            log_msg(context, "Msg", &msg);
         }
     }
     if lines_out > 0 {
@@ -426,12 +426,12 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
             if msg.is_setupmessage() {
                 let setupcodebegin = msg.get_setupcodebegin(context);
                 println!(
-                    "The setup code for setup message {} starts with: {}",
+                    "The setup code for setup message Msg#{} starts with: {}",
                     msg_id,
                     setupcodebegin.unwrap_or_default(),
                 );
             } else {
-                bail!("{} is no setup message.", msg_id,);
+                bail!("Msg#{} is no setup message.", msg_id,);
             }
         }
         "continue-key-transfer" => {
@@ -726,7 +726,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                 let marker = location.marker.as_ref().unwrap_or(&default_marker);
                 info!(
                     context,
-                    "Loc#{}: {}: lat={} lng={} acc={} Chat#{} Contact#{} {} {}",
+                    "Loc#{}: {}: lat={} lng={} acc={} Chat#{} Contact#{} Msg#{} {}",
                     location.location_id,
                     dc_timestamp_to_str(location.timestamp),
                     location.latitude,
@@ -852,9 +852,9 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
             println!("{} images or videos: ", images.len());
             for (i, data) in images.iter().enumerate() {
                 if 0 == i {
-                    print!("{}", data);
+                    print!("Msg#{}", data);
                 } else {
-                    print!(", {}", data);
+                    print!(", Msg#{}", data);
                 }
             }
             print!("\n");

python/tests/test_account.py

@@ -21,7 +21,7 @@ class TestOfflineAccountBasic:
         d = ac1.get_info()
         assert d["arch"]
         assert d["number_of_chats"] == "0"
-        assert d["bcc_self"] == "0"
+        assert d["bcc_self"] == "1"
 
     def test_is_not_configured(self, acfactory):
         ac1 = acfactory.get_unconfigured_account()
@@ -43,7 +43,7 @@ class TestOfflineAccountBasic:
     def test_has_bccself(self, acfactory):
         ac1 = acfactory.get_unconfigured_account()
         assert "bcc_self" in ac1.get_config("sys.config_keys").split()
-        assert ac1.get_config("bcc_self") == "0"
+        assert ac1.get_config("bcc_self") == "1"
 
     def test_selfcontact_if_unconfigured(self, acfactory):
         ac1 = acfactory.get_unconfigured_account()
@@ -405,9 +405,6 @@ class TestOnlineAccount:
         wait_successful_IMAP_SMTP_connection(ac1)
         wait_configuration_progress(ac1, 1000)
 
-        lp.sec("ac1: setting bcc_self=1")
-        ac1.set_config("bcc_self", "1")
-
         lp.sec("send out message with bcc to ourselves")
         msg_out = chat.send_text("message2")
         ev = ac1._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
@@ -645,7 +642,7 @@ class TestOnlineAccount:
         assert os.path.exists(msg_in.filename)
         assert os.stat(msg_in.filename).st_size == os.stat(path).st_size
 
-    def test_import_export_online_all(self, acfactory, tmpdir, lp):
+    def test_import_export_online_all_twice(self, acfactory, tmpdir, lp):
         ac1 = acfactory.get_online_configuring_account()
         wait_configuration_progress(ac1, 1000)
 
@@ -678,7 +675,6 @@ class TestOnlineAccount:
         assert len(messages) == 1
         assert messages[0].text == "msg1"
 
-        pytest.xfail("cannot export twice yet, probably due to interrupt_idle failing")
         # wait until a second passed since last backup
         # because get_latest_backupfile() shall return the latest backup
         # from a UI it's unlikely anyone manages to export two

src/aheader.rs

@@ -1,7 +1,3 @@
-//! # Autocrypt header module
-//!
-//! Parse and create [Autocrypt-headers](https://autocrypt.org/en/latest/level1.html#the-autocrypt-header).
-
 use std::collections::BTreeMap;
 use std::ffi::CStr;
 use std::str::FromStr;
@@ -50,7 +46,7 @@ impl str::FromStr for EncryptPreference {
     }
 }
 
-/// Autocrypt header
+/// Parse and create [Autocrypt-headers](https://autocrypt.org/en/latest/level1.html#the-autocrypt-header).
 #[derive(Debug)]
 pub struct Aheader {
     pub addr: String,
@@ -59,7 +55,6 @@ pub struct Aheader {
 }
 
 impl Aheader {
-    /// Creates new autocrypt header
     pub fn new(addr: String, public_key: Key, prefer_encrypt: EncryptPreference) -> Self {
         Aheader {
             addr,

src/blob.rs

@@ -1,5 +1,3 @@
-//! # Blob directory management
-
 use std::ffi::OsStr;
 use std::fmt;
 use std::fs;

src/chat.rs

@@ -1,9 +1,6 @@
-//! # Chat module
-
 use std::path::{Path, PathBuf};
 
 use itertools::Itertools;
-use num_traits::FromPrimitive;
 
 use crate::blob::{BlobErrorKind, BlobObject};
 use crate::chatlist::*;
@@ -39,7 +36,6 @@ pub struct Chat {
 }
 
 impl Chat {
-    /// Loads chat from the database by its ID.
     pub fn load_from_db(context: &Context, chat_id: u32) -> Result<Self, Error> {
         let res = context.sql.query_row(
             "SELECT c.id,c.type,c.name, c.grpid,c.param,c.archived, \
@@ -229,7 +225,6 @@ impl Chat {
         color
     }
 
-    /// Returns true if the chat is archived.
     pub fn is_archived(&self) -> bool {
         self.archived
     }
@@ -694,8 +689,6 @@ pub fn prepare_msg<'a>(
 
 pub fn msgtype_has_file(msgtype: Viewtype) -> bool {
     match msgtype {
-        Viewtype::Unknown => false,
-        Viewtype::Text => false,
         Viewtype::Image => true,
         Viewtype::Gif => true,
         Viewtype::Sticker => true,
@@ -703,6 +696,7 @@ pub fn msgtype_has_file(msgtype: Viewtype) -> bool {
         Viewtype::Voice => true,
         Viewtype::Video => true,
         Viewtype::File => true,
+        _ => false,
     }
 }
 
@@ -802,8 +796,7 @@ pub fn is_contact_in_chat(context: &Context, chat_id: u32, contact_id: u32) -> b
         .unwrap_or_default()
 }
 
-// note that unarchive() is not the same as archive(false) -
-// eg. unarchive() does not send events as done for archive(false).
+// Should return Result
 pub fn unarchive(context: &Context, chat_id: u32) -> Result<(), Error> {
     sql::execute(
         context,
@@ -879,7 +872,7 @@ pub fn send_text_msg(
 ) -> Result<MsgId, Error> {
     ensure!(
         chat_id > DC_CHAT_ID_LAST_SPECIAL,
-        "bad chat_id = {} <= DC_CHAT_ID_LAST_SPECIAL",
+        "bad chat_id = {} <= 9",
         chat_id
     );
 
@@ -1019,8 +1012,7 @@ pub fn get_chat_msgs(
         Ok(ret)
     };
     let success = if chat_id == DC_CHAT_ID_DEADDROP {
-        let show_emails =
-            ShowEmails::from_i32(context.get_config_int(Config::ShowEmails)).unwrap_or_default();
+        let show_emails = context.get_config_int(Config::ShowEmails);
         context.sql.query_map(
             concat!(
                 "SELECT m.id AS id, m.timestamp AS timestamp",
@@ -1037,7 +1029,7 @@ pub fn get_chat_msgs(
                 "   AND m.msgrmsg>=?",
                 " ORDER BY m.timestamp,m.id;"
             ),
-            params![if show_emails == ShowEmails::All { 0 } else { 1 }],
+            params![if show_emails == 2 { 0 } else { 1 }],
             process_row,
             process_rows,
         )
@@ -1254,7 +1246,7 @@ pub fn get_next_media(
 pub fn archive(context: &Context, chat_id: u32, archive: bool) -> Result<(), Error> {
     ensure!(
         chat_id > DC_CHAT_ID_LAST_SPECIAL,
-        "bad chat_id = {} <= DC_CHAT_ID_LAST_SPECIAL",
+        "bad chat_id = {} <= 9",
         chat_id
     );
 
@@ -1289,7 +1281,7 @@ pub fn archive(context: &Context, chat_id: u32, archive: bool) -> Result<(), Err
 pub fn delete(context: &Context, chat_id: u32) -> Result<(), Error> {
     ensure!(
         chat_id > DC_CHAT_ID_LAST_SPECIAL,
-        "bad chat_id = {} <= DC_CHAT_ID_LAST_SPECIAL",
+        "bad chat_id = {} <= 9",
         chat_id
     );
     /* Up to 2017-11-02 deleting a group also implied leaving it, see above why we have changed this. */
@@ -1578,7 +1570,7 @@ pub fn remove_contact_from_chat(
 ) -> Result<(), Error> {
     ensure!(
         chat_id > DC_CHAT_ID_LAST_SPECIAL,
-        "bad chat_id = {} <= DC_CHAT_ID_LAST_SPECIAL",
+        "bad chat_id = {} <= 9",
         chat_id
     );
     ensure!(
@@ -1935,50 +1927,16 @@ pub fn get_chat_id_by_grpid(context: &Context, grpid: impl AsRef<str>) -> (u32,
 }
 
 pub fn add_device_msg(context: &Context, msg: &mut Message) -> Result<MsgId, Error> {
-    add_device_msg_maybe_labelled(context, None, msg)
-}
-
-pub fn add_device_msg_once(
-    context: &Context,
-    label: &str,
-    msg: &mut Message,
-) -> Result<MsgId, Error> {
-    add_device_msg_maybe_labelled(context, Some(label), msg)
-}
-
-fn add_device_msg_maybe_labelled(
-    context: &Context,
-    label: Option<&str>,
-    msg: &mut Message,
-) -> Result<MsgId, Error> {
     let (chat_id, _blocked) =
         create_or_lookup_by_contact_id(context, DC_CONTACT_ID_DEVICE, Blocked::Not)?;
     let rfc724_mid = dc_create_outgoing_rfc724_mid(None, "@device");
 
-    // chat_id has an sql-index so it makes sense to add this although redundant
-    if let Some(label) = label {
-        if let Ok(msg_id) = context.sql.query_row(
-            "SELECT id FROM msgs WHERE chat_id=? AND label=?",
-            params![chat_id, label],
-            |row| {
-                let msg_id: MsgId = row.get(0)?;
-                Ok(msg_id)
-            },
-        ) {
-            info!(
-                context,
-                "device-message {} already exist as {}", label, msg_id
-            );
-            return Ok(msg_id);
-        }
-    }
-
     prepare_msg_blob(context, msg)?;
     unarchive(context, chat_id)?;
 
     context.sql.execute(
-        "INSERT INTO msgs (chat_id,from_id,to_id, timestamp,type,state, txt,param,rfc724_mid,label) \
-         VALUES (?,?,?, ?,?,?, ?,?,?,?);",
+        "INSERT INTO msgs (chat_id,from_id,to_id, timestamp,type,state, txt,param,rfc724_mid) \
+         VALUES (?,?,?, ?,?,?, ?,?,?);",
         params![
             chat_id,
             DC_CONTACT_ID_DEVICE,
@@ -1989,19 +1947,12 @@ fn add_device_msg_maybe_labelled(
             msg.text.as_ref().map_or("", String::as_str),
             msg.param.to_string(),
             rfc724_mid,
-            label.unwrap_or_default(),
         ],
     )?;
 
     let row_id = sql::get_rowid(context, &context.sql, "msgs", "rfc724_mid", &rfc724_mid);
     let msg_id = MsgId::new(row_id);
     context.call_cb(Event::IncomingMsg { chat_id, msg_id });
-    info!(
-        context,
-        "device-message {} added as {}",
-        label.unwrap_or("without label"),
-        msg_id
-    );
 
     Ok(msg_id)
 }
@@ -2083,164 +2034,4 @@ mod tests {
         let added = add_contact_to_chat_ex(&t.ctx, chat_id, DC_CONTACT_ID_SELF, false).unwrap();
         assert_eq!(added, false);
     }
-
-    #[test]
-    fn test_self_talk() {
-        let t = dummy_context();
-        let chat_id = create_by_contact_id(&t.ctx, DC_CONTACT_ID_SELF).unwrap();
-        assert_eq!(DC_CONTACT_ID_SELF, 1);
-        assert!(chat_id > DC_CHAT_ID_LAST_SPECIAL);
-        let chat = Chat::load_from_db(&t.ctx, chat_id).unwrap();
-        assert_eq!(chat.id, chat_id);
-        assert!(chat.is_self_talk());
-        assert!(!chat.archived);
-        assert!(!chat.is_device_talk());
-        assert!(chat.can_send());
-        assert_eq!(chat.name, t.ctx.stock_str(StockMessage::SelfMsg));
-    }
-
-    #[test]
-    fn test_deaddrop_chat() {
-        let t = dummy_context();
-        let chat = Chat::load_from_db(&t.ctx, DC_CHAT_ID_DEADDROP).unwrap();
-        assert_eq!(DC_CHAT_ID_DEADDROP, 1);
-        assert_eq!(chat.id, DC_CHAT_ID_DEADDROP);
-        assert!(!chat.is_self_talk());
-        assert!(!chat.archived);
-        assert!(!chat.is_device_talk());
-        assert!(!chat.can_send());
-        assert_eq!(chat.name, t.ctx.stock_str(StockMessage::DeadDrop));
-    }
-
-    #[test]
-    fn test_add_device_msg() {
-        let t = test_context(Some(Box::new(logging_cb)));
-
-        // add two device-messages
-        let mut msg1 = Message::new(Viewtype::Text);
-        msg1.text = Some("first message".to_string());
-        let msg1_id = add_device_msg(&t.ctx, &mut msg1);
-        assert!(msg1_id.is_ok());
-
-        let mut msg2 = Message::new(Viewtype::Text);
-        msg2.text = Some("second message".to_string());
-        let msg2_id = add_device_msg(&t.ctx, &mut msg2);
-        assert!(msg2_id.is_ok());
-        assert_ne!(msg1_id.as_ref().unwrap(), msg2_id.as_ref().unwrap());
-
-        // check added messages
-        let msg1 = message::Message::load_from_db(&t.ctx, msg1_id.unwrap());
-        assert!(msg1.is_ok());
-        let msg1 = msg1.unwrap();
-        assert_eq!(msg1.text.as_ref().unwrap(), "first message");
-        assert_eq!(msg1.from_id, DC_CONTACT_ID_DEVICE);
-        assert_eq!(msg1.to_id, DC_CONTACT_ID_SELF);
-        assert!(!msg1.is_info());
-        assert!(!msg1.is_setupmessage());
-
-        let msg2 = message::Message::load_from_db(&t.ctx, msg2_id.unwrap());
-        assert!(msg2.is_ok());
-        let msg2 = msg2.unwrap();
-        assert_eq!(msg2.text.as_ref().unwrap(), "second message");
-
-        // check device chat
-        assert_eq!(get_msg_cnt(&t.ctx, msg2.chat_id), 2);
-    }
-
-    #[test]
-    fn test_add_device_msg_once() {
-        let t = test_context(Some(Box::new(logging_cb)));
-
-        // add two device-messages with the same label (second attempt is not added)
-        let mut msg1 = Message::new(Viewtype::Text);
-        msg1.text = Some("first message".to_string());
-        let msg1_id = add_device_msg_once(&t.ctx, "any-label", &mut msg1);
-        assert!(msg1_id.is_ok());
-
-        let mut msg2 = Message::new(Viewtype::Text);
-        msg2.text = Some("second message".to_string());
-        let msg2_id = add_device_msg_once(&t.ctx, "any-label", &mut msg2);
-        assert!(msg2_id.is_ok());
-        assert_eq!(msg1_id.as_ref().unwrap(), msg2_id.as_ref().unwrap());
-
-        // check added message
-        let msg2 = message::Message::load_from_db(&t.ctx, msg2_id.unwrap());
-        assert!(msg2.is_ok());
-        let msg2 = msg2.unwrap();
-        assert_eq!(msg1_id.unwrap(), msg2.id);
-        assert_eq!(msg2.text.as_ref().unwrap(), "first message");
-        assert_eq!(msg2.from_id, DC_CONTACT_ID_DEVICE);
-        assert_eq!(msg2.to_id, DC_CONTACT_ID_SELF);
-        assert!(!msg2.is_info());
-        assert!(!msg2.is_setupmessage());
-
-        // check device chat
-        let chat_id = msg2.chat_id;
-        assert_eq!(get_msg_cnt(&t.ctx, chat_id), 1);
-        assert!(chat_id > DC_CHAT_ID_LAST_SPECIAL);
-        let chat = Chat::load_from_db(&t.ctx, chat_id);
-        assert!(chat.is_ok());
-        let chat = chat.unwrap();
-        assert!(chat.is_device_talk());
-        assert!(!chat.is_self_talk());
-        assert!(!chat.can_send());
-        assert_eq!(chat.name, t.ctx.stock_str(StockMessage::DeviceMessages));
-        assert!(chat.get_profile_image(&t.ctx).is_some());
-    }
-
-    fn chatlist_len(ctx: &Context, listflags: usize) -> usize {
-        Chatlist::try_load(ctx, listflags, None, None)
-            .unwrap()
-            .len()
-    }
-
-    #[test]
-    fn test_archive() {
-        // create two chats
-        let t = dummy_context();
-        let mut msg = Message::new(Viewtype::Text);
-        msg.text = Some("foo".to_string());
-        let msg_id = add_device_msg(&t.ctx, &mut msg).unwrap();
-        let chat_id1 = message::Message::load_from_db(&t.ctx, msg_id)
-            .unwrap()
-            .chat_id;
-        let chat_id2 = create_by_contact_id(&t.ctx, DC_CONTACT_ID_SELF).unwrap();
-        assert!(chat_id1 > DC_CHAT_ID_LAST_SPECIAL);
-        assert!(chat_id2 > DC_CHAT_ID_LAST_SPECIAL);
-        assert_eq!(get_chat_cnt(&t.ctx), 2);
-        assert_eq!(chatlist_len(&t.ctx, 0), 2);
-        assert_eq!(chatlist_len(&t.ctx, DC_GCL_NO_SPECIALS), 2);
-        assert_eq!(chatlist_len(&t.ctx, DC_GCL_ARCHIVED_ONLY), 0);
-        assert_eq!(DC_GCL_ARCHIVED_ONLY, 0x01);
-        assert_eq!(DC_GCL_NO_SPECIALS, 0x02);
-
-        // archive first chat
-        assert!(archive(&t.ctx, chat_id1, true).is_ok());
-        assert!(Chat::load_from_db(&t.ctx, chat_id1).unwrap().is_archived());
-        assert!(!Chat::load_from_db(&t.ctx, chat_id2).unwrap().is_archived());
-        assert_eq!(get_chat_cnt(&t.ctx), 2);
-        assert_eq!(chatlist_len(&t.ctx, 0), 2); // including DC_CHAT_ID_ARCHIVED_LINK now
-        assert_eq!(chatlist_len(&t.ctx, DC_GCL_NO_SPECIALS), 1);
-        assert_eq!(chatlist_len(&t.ctx, DC_GCL_ARCHIVED_ONLY), 1);
-
-        // archive second chat
-        assert!(archive(&t.ctx, chat_id2, true).is_ok());
-        assert!(Chat::load_from_db(&t.ctx, chat_id1).unwrap().is_archived());
-        assert!(Chat::load_from_db(&t.ctx, chat_id2).unwrap().is_archived());
-        assert_eq!(get_chat_cnt(&t.ctx), 2);
-        assert_eq!(chatlist_len(&t.ctx, 0), 1); // only DC_CHAT_ID_ARCHIVED_LINK now
-        assert_eq!(chatlist_len(&t.ctx, DC_GCL_NO_SPECIALS), 0);
-        assert_eq!(chatlist_len(&t.ctx, DC_GCL_ARCHIVED_ONLY), 2);
-
-        // archive already archived first chat, unarchive second chat two times
-        assert!(archive(&t.ctx, chat_id1, true).is_ok());
-        assert!(archive(&t.ctx, chat_id2, false).is_ok());
-        assert!(archive(&t.ctx, chat_id2, false).is_ok());
-        assert!(Chat::load_from_db(&t.ctx, chat_id1).unwrap().is_archived());
-        assert!(!Chat::load_from_db(&t.ctx, chat_id2).unwrap().is_archived());
-        assert_eq!(get_chat_cnt(&t.ctx), 2);
-        assert_eq!(chatlist_len(&t.ctx, 0), 2);
-        assert_eq!(chatlist_len(&t.ctx, DC_GCL_NO_SPECIALS), 1);
-        assert_eq!(chatlist_len(&t.ctx, DC_GCL_ARCHIVED_ONLY), 1);
-    }
 }

src/chatlist.rs

@@ -1,5 +1,3 @@
-//! # Chat list module
-
 use crate::chat::*;
 use crate::constants::*;
 use crate::contact::*;
@@ -128,7 +126,7 @@ impl Chatlist {
                     "               SELECT MAX(timestamp)",
                     "                 FROM msgs",
                     "                WHERE chat_id=c.id",
-                    "                  AND hidden=0)",
+                    "                  AND (hidden=0 OR (hidden=1 AND state=19)))",
                     " WHERE c.id>9",
                     "   AND c.blocked=0",
                     "   AND c.id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?)",
@@ -151,7 +149,7 @@ impl Chatlist {
                     "               SELECT MAX(timestamp)",
                     "                 FROM msgs",
                     "                WHERE chat_id=c.id",
-                    "                  AND hidden=0)",
+                    "                  AND (hidden=0 OR (hidden=1 AND state=19)))",
                     " WHERE c.id>9",
                     "   AND c.blocked=0",
                     "   AND c.archived=1",
@@ -177,7 +175,7 @@ impl Chatlist {
                     "               SELECT MAX(timestamp)",
                     "                 FROM msgs",
                     "                WHERE chat_id=c.id",
-                    "                  AND hidden=0)",
+                    "                  AND (hidden=0 OR (hidden=1 AND state=19)))",
                     " WHERE c.id>9",
                     "   AND c.blocked=0",
                     "   AND c.name LIKE ?",
@@ -200,7 +198,7 @@ impl Chatlist {
                     "               SELECT MAX(timestamp)",
                     "                 FROM msgs",
                     "                WHERE chat_id=c.id",
-                    "                  AND hidden=0)",
+                    "                  AND (hidden=0 OR (hidden=1 AND state=19)))",
                     " WHERE c.id>9",
                     "   AND c.blocked=0",
                     "   AND c.archived=0",
@@ -235,7 +233,6 @@ impl Chatlist {
         self.ids.len()
     }
 
-    /// Returns true if chatlist is empty.
     pub fn is_empty(&self) -> bool {
         self.ids.is_empty()
     }
@@ -297,7 +294,7 @@ impl Chatlist {
         let lastmsg_id = self.ids[index].1;
         let mut lastcontact = None;
 
-        let mut lastmsg = if let Ok(lastmsg) = Message::load_from_db(context, lastmsg_id) {
+        let lastmsg = if let Ok(lastmsg) = Message::load_from_db(context, lastmsg_id) {
             if lastmsg.from_id != DC_CONTACT_ID_SELF
                 && (chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup)
             {
@@ -309,16 +306,6 @@ impl Chatlist {
             None
         };
 
-        if let Ok(draft) = get_draft(context, chat.id) {
-            if draft.is_some()
-                && (lastmsg.is_none()
-                    || draft.as_ref().unwrap().timestamp_sort
-                        > lastmsg.as_ref().unwrap().timestamp_sort)
-            {
-                lastmsg = draft;
-            }
-        }
-
         if chat.id == DC_CHAT_ID_ARCHIVED_LINK {
             ret.text2 = None;
         } else if lastmsg.is_none() || lastmsg.as_ref().unwrap().from_id == DC_CONTACT_ID_UNDEFINED
@@ -332,7 +319,6 @@ impl Chatlist {
     }
 }
 
-/// Get the number of archived chats
 pub fn dc_get_archived_cnt(context: &Context) -> u32 {
     context
         .sql

src/config.rs

@@ -1,5 +1,3 @@
-//! # Key-value configuration management
-
 use strum::{EnumProperty, IntoEnumIterator};
 use strum_macros::{AsRefStr, Display, EnumIter, EnumProperty, EnumString};
 
@@ -33,7 +31,7 @@ pub enum Config {
     Displayname,
     Selfstatus,
     Selfavatar,
-    #[strum(props(default = "0"))]
+    #[strum(props(default = "1"))]
     BccSelf,
     #[strum(props(default = "1"))]
     E2eeEnabled,

src/configure/auto_mozilla.rs

@@ -1,4 +1,3 @@
-//! Thunderbird's Autoconfiguration implementation
 use quick_xml;
 use quick_xml::events::{BytesEnd, BytesStart, BytesText};
 

src/configure/mod.rs

@@ -1,5 +1,3 @@
-//! Email accounts autoconfiguration process module
-
 use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
 
 use crate::config::Config;
@@ -423,16 +421,6 @@ pub fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context) {
         );
     }
     */
-
-    // remember the entered parameters on success
-    // and restore to last-entered on failure.
-    // this way, the parameters visible to the ui are always in-sync with the current configuration.
-    if success {
-        LoginParam::from_database(context, "").save_to_database(context, "configured_raw_");
-    } else {
-        LoginParam::from_database(context, "configured_raw_").save_to_database(context, "");
-    }
-
     context.free_ongoing();
     progress!(context, if success { 1000 } else { 0 });
 }
@@ -565,7 +553,9 @@ fn try_smtp_one_param(context: &Context, param: &LoginParam) -> Option<bool> {
     }
 }
 
-/// Connects to the configured account
+/*******************************************************************************
+ * Connect to configured account
+ ******************************************************************************/
 pub fn dc_connect_to_configured_imap(context: &Context, imap: &Imap) -> libc::c_int {
     let mut ret_connected = 0;
 

src/constants.rs

@@ -1,4 +1,4 @@
-//! # Constants
+//! Constants
 #![allow(non_camel_case_types, dead_code)]
 
 use deltachat_derive::*;

src/contact.rs

@@ -47,8 +47,8 @@ pub struct Contact {
     /// May be empty, initially set to `authname`.
     name: String,
     /// Name authorized by the contact himself. Only this name may be spread to others,
-    /// e.g. in To:-lists. May be empty. It is recommended to use `Contact::get_authname`,
-    /// to access this field.
+    /// e.g. in To:-lists. May be empty. It is recommended to use `Contact::get_name`,
+    /// `Contact::get_display_name` or `Contact::get_name_n_addr` to access this field.
     authname: String,
     /// E-Mail-Address of the contact. It is recommended to use `Contact::get_addr`` to access this field.
     addr: String,
@@ -717,7 +717,6 @@ impl Contact {
         &self.addr
     }
 
-    /// Get name authorized by the contact.
     pub fn get_authname(&self) -> &str {
         &self.authname
     }
@@ -876,7 +875,7 @@ impl Contact {
     }
 
     pub fn real_exists_by_id(context: &Context, contact_id: u32) -> bool {
-        if !context.sql.is_open() || contact_id <= DC_CONTACT_ID_LAST_SPECIAL {
+        if !context.sql.is_open() || contact_id <= 9 {
             return false;
         }
 
@@ -900,7 +899,6 @@ impl Contact {
     }
 }
 
-/// Extracts first name from full name.
 fn get_first_name<'a>(full_name: &'a str) -> &'a str {
     full_name.splitn(2, ' ').next().unwrap_or_default()
 }
@@ -911,7 +909,6 @@ pub fn may_be_valid_addr(addr: &str) -> bool {
     res.is_ok()
 }
 
-/// Returns address with whitespace trimmed and `mailto:` prefix removed.
 pub fn addr_normalize(addr: &str) -> &str {
     let norm = addr.trim();
 
@@ -923,7 +920,7 @@ pub fn addr_normalize(addr: &str) -> &str {
 }
 
 fn set_block_contact(context: &Context, contact_id: u32, new_blocking: bool) {
-    if contact_id <= DC_CONTACT_ID_LAST_SPECIAL {
+    if contact_id <= 9 {
         return;
     }
 
@@ -1056,8 +1053,6 @@ fn split_address_book(book: &str) -> Vec<(&str, &str)> {
 mod tests {
     use super::*;
 
-    use crate::test_utils::*;
-
     #[test]
     fn test_may_be_valid_addr() {
         assert_eq!(may_be_valid_addr(""), false);
@@ -1099,109 +1094,4 @@ mod tests {
             vec![("Name one", "Address one"), ("Name two", "Address two")]
         )
     }
-
-    #[test]
-    fn test_get_contacts() {
-        let context = dummy_context();
-        let contacts = Contact::get_all(&context.ctx, 0, Some("some2")).unwrap();
-        assert_eq!(contacts.len(), 0);
-
-        let id = Contact::create(&context.ctx, "bob", "bob@mail.de").unwrap();
-        assert_ne!(id, 0);
-
-        let contacts = Contact::get_all(&context.ctx, 0, Some("bob")).unwrap();
-        assert_eq!(contacts.len(), 1);
-
-        let contacts = Contact::get_all(&context.ctx, 0, Some("alice")).unwrap();
-        assert_eq!(contacts.len(), 0);
-    }
-
-    #[test]
-    fn test_add_or_lookup() {
-        // add some contacts, this also tests add_address_book()
-        let t = dummy_context();
-        let book = concat!(
-            "  Name one  \n one@eins.org \n",
-            "Name two\ntwo@deux.net\n",
-            "\nthree@drei.sam\n",
-            "Name two\ntwo@deux.net\n" // should not be added again
-        );
-        assert_eq!(Contact::add_address_book(&t.ctx, book).unwrap(), 3);
-
-        // check first added contact, this does not modify because of lower origin
-        let (contact_id, sth_modified) =
-            Contact::add_or_lookup(&t.ctx, "bla foo", "one@eins.org", Origin::IncomingUnknownTo)
-                .unwrap();
-        assert!(contact_id > DC_CONTACT_ID_LAST_SPECIAL);
-        assert_eq!(sth_modified, Modifier::None);
-        let contact = Contact::load_from_db(&t.ctx, contact_id).unwrap();
-        assert_eq!(contact.get_id(), contact_id);
-        assert_eq!(contact.get_name(), "Name one");
-        assert_eq!(contact.get_display_name(), "Name one");
-        assert_eq!(contact.get_addr(), "one@eins.org");
-        assert_eq!(contact.get_name_n_addr(), "Name one (one@eins.org)");
-
-        // modify first added contact
-        let (contact_id_test, sth_modified) = Contact::add_or_lookup(
-            &t.ctx,
-            "Real one",
-            " one@eins.org  ",
-            Origin::ManuallyCreated,
-        )
-        .unwrap();
-        assert_eq!(contact_id, contact_id_test);
-        assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::load_from_db(&t.ctx, contact_id).unwrap();
-        assert_eq!(contact.get_name(), "Real one");
-        assert_eq!(contact.get_addr(), "one@eins.org");
-        assert!(!contact.is_blocked());
-
-        // check third added contact (contact without name)
-        let (contact_id, sth_modified) =
-            Contact::add_or_lookup(&t.ctx, "", "three@drei.sam", Origin::IncomingUnknownTo)
-                .unwrap();
-        assert!(contact_id > DC_CONTACT_ID_LAST_SPECIAL);
-        assert_eq!(sth_modified, Modifier::None);
-        let contact = Contact::load_from_db(&t.ctx, contact_id).unwrap();
-        assert_eq!(contact.get_name(), "");
-        assert_eq!(contact.get_display_name(), "three@drei.sam");
-        assert_eq!(contact.get_addr(), "three@drei.sam");
-        assert_eq!(contact.get_name_n_addr(), "three@drei.sam");
-
-        // add name to third contact from incoming message (this becomes authorized name)
-        let (contact_id_test, sth_modified) = Contact::add_or_lookup(
-            &t.ctx,
-            "m. serious",
-            "three@drei.sam",
-            Origin::IncomingUnknownFrom,
-        )
-        .unwrap();
-        assert_eq!(contact_id, contact_id_test);
-        assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::load_from_db(&t.ctx, contact_id).unwrap();
-        assert_eq!(contact.get_name_n_addr(), "m. serious (three@drei.sam)");
-        assert!(!contact.is_blocked());
-
-        // manually edit name of third contact (does not changed authorized name)
-        let (contact_id_test, sth_modified) = Contact::add_or_lookup(
-            &t.ctx,
-            "schnucki",
-            "three@drei.sam",
-            Origin::ManuallyCreated,
-        )
-        .unwrap();
-        assert_eq!(contact_id, contact_id_test);
-        assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::load_from_db(&t.ctx, contact_id).unwrap();
-        assert_eq!(contact.get_authname(), "m. serious");
-        assert_eq!(contact.get_name_n_addr(), "schnucki (three@drei.sam)");
-        assert!(!contact.is_blocked());
-
-        // check SELF
-        let contact = Contact::load_from_db(&t.ctx, DC_CONTACT_ID_SELF).unwrap();
-        assert_eq!(DC_CONTACT_ID_SELF, 1);
-        assert_eq!(contact.get_name(), t.ctx.stock_str(StockMessage::SelfMsg));
-        assert_eq!(contact.get_addr(), ""); // we're not configured
-        assert!(!contact.is_blocked());
-    }
 }

src/context.rs

@@ -39,9 +39,7 @@ pub type ContextCallback = dyn Fn(&Context, Event) -> uintptr_t + Send + Sync;
 
 #[derive(DebugStub)]
 pub struct Context {
-    /// Database file path
     dbfile: PathBuf,
-    /// Blob directory path
     blobdir: PathBuf,
     pub sql: Sql,
     pub inbox: Arc<RwLock<Imap>>,
@@ -95,7 +93,6 @@ pub fn get_info() -> HashMap<&'static str, String> {
 }
 
 impl Context {
-    /// Creates new context.
     pub fn new(cb: Box<ContextCallback>, os_name: String, dbfile: PathBuf) -> Result<Context> {
         let mut blob_fname = OsString::new();
         blob_fname.push(dbfile.file_name().unwrap_or_default());
@@ -156,12 +153,10 @@ impl Context {
         Ok(ctx)
     }
 
-    /// Returns database file path.
     pub fn get_dbfile(&self) -> &Path {
         self.dbfile.as_path()
     }
 
-    /// Returns blob directory path.
     pub fn get_blobdir(&self) -> &Path {
         self.blobdir.as_path()
     }

src/dc_tools.rs

@@ -154,15 +154,13 @@ pub(crate) fn dc_timestamp_from_date(date_time: *mut mailimf_date_time) -> i64 {
  ******************************************************************************/
 
 pub fn dc_timestamp_to_str(wanted: i64) -> String {
-    let ts = Local.timestamp(wanted, 0);
+    let ts = chrono::Utc.timestamp(wanted, 0);
     ts.format("%Y.%m.%d %H:%M:%S").to_string()
 }
 
 pub(crate) fn dc_gm2local_offset() -> i64 {
-    /* returns the offset that must be _added_ to an UTC/GMT-time to create the localtime.
-    the function may return negative values. */
     let lt = Local::now();
-    lt.offset().local_minus_utc() as i64
+    ((lt.offset().local_minus_utc() / (60 * 60)) * 100) as i64
 }
 
 /* timesmearing */

src/imap.rs

@@ -502,8 +502,8 @@ impl Imap {
         }
 
         info!(context, "IMAP unsetup_handle step 3 (clearing config).");
-        self.config.write().unwrap().selected_folder = None;
-        self.config.write().unwrap().selected_mailbox = None;
+        // self.config.write().unwrap().selected_folder = None;
+        // self.config.write().unwrap().selected_mailbox = None;
         info!(context, "IMAP unsetup_handle step 4 (disconnected).",);
     }
 

src/imex.rs

@@ -1,5 +1,3 @@
-//! # Import/export module
-
 use core::cmp::{max, min};
 use std::path::Path;
 
@@ -157,11 +155,6 @@ fn do_initiate_key_transfer(context: &Context) -> Result<String> {
             }
         }
     }
-    // no maybe_add_bcc_self_device_msg() here.
-    // the ui shows the dialog with the setup code on this device,
-    // it would be too much noise to have two things popping up at the same time.
-    // maybe_add_bcc_self_device_msg() is called on the other device
-    // once the transfer is completed.
     Ok(setup_code)
 }
 
@@ -237,21 +230,6 @@ pub fn create_setup_code(_context: &Context) -> String {
     ret
 }
 
-fn maybe_add_bcc_self_device_msg(context: &Context) -> Result<()> {
-    if !context.sql.get_raw_config_bool(context, "bcc_self") {
-        let mut msg = Message::new(Viewtype::Text);
-        // TODO: define this as a stockstring once the wording is settled.
-        msg.text = Some(
-            "It seems you are using multiple devices with Delta Chat. Great!\n\n\
-             If you also want to synchronize outgoing messages accross all devices, \
-             go to the settings and enable \"Send copy to self\"."
-                .to_string(),
-        );
-        chat::add_device_msg_once(context, "bcc-self-hint", &mut msg)?;
-    }
-    Ok(())
-}
-
 pub fn continue_key_transfer(context: &Context, msg_id: MsgId, setup_code: &str) -> Result<()> {
     ensure!(!msg_id.is_special(), "wrong id");
 
@@ -266,7 +244,6 @@ pub fn continue_key_transfer(context: &Context, msg_id: MsgId, setup_code: &str)
         let sc = normalize_setup_code(setup_code);
         let armored_key = decrypt_setup_file(context, &sc, file)?;
         set_self_key(context, &armored_key, true, true)?;
-        maybe_add_bcc_self_device_msg(context)?;
 
         Ok(())
     } else {

src/key.rs

@@ -1,5 +1,3 @@
-//! Cryptographic key module
-
 use std::collections::BTreeMap;
 use std::io::Cursor;
 use std::path::Path;
@@ -13,7 +11,6 @@ use crate::context::Context;
 use crate::dc_tools::*;
 use crate::sql::{self, Sql};
 
-/// Cryptographic key
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum Key {
     Public(SignedPublicKey),
@@ -32,44 +29,44 @@ impl From<SignedSecretKey> for Key {
     }
 }
 
-impl std::convert::TryFrom<Key> for SignedSecretKey {
+impl std::convert::TryInto<SignedSecretKey> for Key {
     type Error = ();
 
-    fn try_from(value: Key) -> Result<Self, Self::Error> {
-        match value {
+    fn try_into(self) -> Result<SignedSecretKey, Self::Error> {
+        match self {
             Key::Public(_) => Err(()),
             Key::Secret(key) => Ok(key),
         }
     }
 }
 
-impl<'a> std::convert::TryFrom<&'a Key> for &'a SignedSecretKey {
+impl<'a> std::convert::TryInto<&'a SignedSecretKey> for &'a Key {
     type Error = ();
 
-    fn try_from(value: &'a Key) -> Result<Self, Self::Error> {
-        match value {
+    fn try_into(self) -> Result<&'a SignedSecretKey, Self::Error> {
+        match self {
             Key::Public(_) => Err(()),
             Key::Secret(key) => Ok(key),
         }
     }
 }
 
-impl std::convert::TryFrom<Key> for SignedPublicKey {
+impl std::convert::TryInto<SignedPublicKey> for Key {
     type Error = ();
 
-    fn try_from(value: Key) -> Result<Self, Self::Error> {
-        match value {
+    fn try_into(self) -> Result<SignedPublicKey, Self::Error> {
+        match self {
             Key::Public(key) => Ok(key),
             Key::Secret(_) => Err(()),
         }
     }
 }
 
-impl<'a> std::convert::TryFrom<&'a Key> for &'a SignedPublicKey {
+impl<'a> std::convert::TryInto<&'a SignedPublicKey> for &'a Key {
     type Error = ();
 
-    fn try_from(value: &'a Key) -> Result<Self, Self::Error> {
-        match value {
+    fn try_into(self) -> Result<&'a SignedPublicKey, Self::Error> {
+        match self {
             Key::Public(key) => Ok(key),
             Key::Secret(_) => Err(()),
         }

src/location.rs

@@ -1,5 +1,3 @@
-//! Location handling
-
 use bitflags::bitflags;
 use quick_xml;
 use quick_xml::events::{BytesEnd, BytesStart, BytesText};
@@ -18,7 +16,7 @@ use crate::param::*;
 use crate::sql;
 use crate::stock::StockMessage;
 
-/// Location record
+// location handling
 #[derive(Debug, Clone, Default)]
 pub struct Location {
     pub location_id: u32,

src/log.rs

@@ -1,5 +1,3 @@
-//! # Logging macros
-
 #[macro_export]
 macro_rules! info {
     ($ctx:expr,  $msg:expr) => {

src/message.rs

@@ -841,11 +841,6 @@ pub fn get_mime_headers(context: &Context, msg_id: MsgId) -> Option<String> {
 
 pub fn delete_msgs(context: &Context, msg_ids: &[MsgId]) {
     for msg_id in msg_ids.iter() {
-        if let Ok(msg) = Message::load_from_db(context, *msg_id) {
-            if msg.location_id > 0 {
-                delete_poi_location(context, msg.location_id);
-            }
-        }
         update_msg_chat_id(context, *msg_id, DC_CHAT_ID_TRASH);
         job_add(
             context,
@@ -876,16 +871,6 @@ fn update_msg_chat_id(context: &Context, msg_id: MsgId, chat_id: u32) -> bool {
     .is_ok()
 }
 
-fn delete_poi_location(context: &Context, location_id: u32) -> bool {
-    sql::execute(
-        context,
-        &context.sql,
-        "DELETE FROM locations WHERE independent = 1 AND id=?;",
-        params![location_id as i32],
-    )
-    .is_ok()
-}
-
 pub fn markseen_msgs(context: &Context, msg_ids: &[MsgId]) -> bool {
     if msg_ids.is_empty() {
         return false;
@@ -1119,7 +1104,7 @@ pub fn mdn_from_ext(
     rfc724_mid: &str,
     timestamp_sent: i64,
 ) -> Option<(u32, MsgId)> {
-    if from_id <= DC_MSG_ID_LAST_SPECIAL || rfc724_mid.is_empty() {
+    if from_id <= 9 || rfc724_mid.is_empty() {
         return None;
     }
 

src/oauth2.rs

@@ -1,5 +1,3 @@
-//! OAuth 2 module
-
 use std::collections::HashMap;
 
 use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
@@ -35,14 +33,12 @@ struct Oauth2 {
     get_userinfo: Option<&'static str>,
 }
 
-/// OAuth 2 Access Token Response
 #[derive(Debug, Deserialize)]
 struct Response {
     // Should always be there according to: https://www.oauth.com/oauth2-servers/access-tokens/access-token-response/
     // but previous code handled its abscense.
     access_token: Option<String>,
     token_type: String,
-    /// Duration of time the token is granted for, in seconds
     expires_in: Option<u64>,
     refresh_token: Option<String>,
     scope: Option<String>,
@@ -209,7 +205,7 @@ pub fn dc_get_oauth2_access_token(
                 .ok();
             let expires_in = response
                 .expires_in
-                // refresh a bit before
+                // refresh a bet before
                 .map(|t| time() + t as i64 - 5)
                 .unwrap_or_else(|| 0);
             context

src/peerstate.rs

@@ -1,4 +1,3 @@
-//! # [Autocrypt Peer State](https://autocrypt.org/level1.html#peer-state-management) module
 use std::collections::HashSet;
 use std::fmt;
 
@@ -383,11 +382,11 @@ impl<'a> Peerstate<'a> {
             sql::execute(
                 self.context,
                 sql,
-                "UPDATE acpeerstates \
-                 SET last_seen=?, last_seen_autocrypt=?, prefer_encrypted=?, \
-                 public_key=?, gossip_timestamp=?, gossip_key=?, public_key_fingerprint=?, gossip_key_fingerprint=?, \
+		"UPDATE acpeerstates \
+		 SET last_seen=?, last_seen_autocrypt=?, prefer_encrypted=?, \
+		 public_key=?, gossip_timestamp=?, gossip_key=?, public_key_fingerprint=?, gossip_key_fingerprint=?, \
                  verified_key=?, verified_key_fingerprint=? \
-                 WHERE addr=?;",
+		 WHERE addr=?;",
                 params![
                     self.last_seen,
                     self.last_seen_autocrypt,

src/pgp.rs

@@ -1,5 +1,3 @@
-//! OpenPGP helper module using [rPGP facilities](https://github.com/rpgp/rpgp)
-
 use std::collections::{BTreeMap, HashSet};
 use std::convert::TryInto;
 use std::io::Cursor;
@@ -7,7 +5,7 @@ use std::io::Cursor;
 use pgp::armor::BlockType;
 use pgp::composed::{
     Deserializable, KeyType as PgpKeyType, Message, SecretKeyParamsBuilder, SignedPublicKey,
-    SignedPublicSubKey, SignedSecretKey, SubkeyParamsBuilder,
+    SignedSecretKey, SubkeyParamsBuilder,
 };
 use pgp::crypto::{HashAlgorithm, SymmetricKeyAlgorithm};
 use pgp::types::{CompressionAlgorithm, KeyTrait, SecretKeyTrait, StringToKey};
@@ -99,31 +97,18 @@ pub fn create_keypair(addr: impl AsRef<str>) -> Option<(Key, Key)> {
     Some((Key::Public(public_key), Key::Secret(private_key)))
 }
 
-/// Select subkey of the public key to use for encryption.
-///
-/// Currently the first subkey is selected.
-fn select_pk_for_encryption(key: &SignedPublicKey) -> Option<&SignedPublicSubKey> {
-    key.public_subkeys.iter().find(|_k|
-        // TODO: check if it is an encryption subkey
-        true)
-}
-
-/// Encrypts `plain` text using `public_keys_for_encryption`
-/// and signs it using `private_key_for_signing`.
 pub fn pk_encrypt(
     plain: &[u8],
     public_keys_for_encryption: &Keyring,
     private_key_for_signing: Option<&Key>,
 ) -> Result<String, Error> {
     let lit_msg = Message::new_literal_bytes("", plain);
-    let pkeys: Vec<&SignedPublicSubKey> = public_keys_for_encryption
+    let pkeys: Vec<&SignedPublicKey> = public_keys_for_encryption
         .keys()
         .iter()
         .filter_map(|key| {
-            key.as_ref()
-                .try_into()
-                .ok()
-                .and_then(select_pk_for_encryption)
+            let k: &Key = &key;
+            k.try_into().ok()
         })
         .collect();
 

src/qr.rs

@@ -1,5 +1,3 @@
-//! # QR code module
-
 use lazy_static::lazy_static;
 use percent_encoding::percent_decode_str;
 

src/securejoin.rs

@@ -1,5 +1,3 @@
-//! Verified contact protocol implementation as [specified by countermitm project](https://countermitm.readthedocs.io/en/stable/new.html#setup-contact-protocol)
-
 use percent_encoding::{utf8_percent_encode, AsciiSet, NON_ALPHANUMERIC};
 
 use crate::aheader::EncryptPreference;

src/sql.rs

@@ -1,5 +1,3 @@
-//! # SQLite wrapper
-
 use std::collections::HashSet;
 use std::sync::{Arc, RwLock};
 use std::time::Duration;
@@ -7,7 +5,6 @@ use std::time::Duration;
 use rusqlite::{Connection, OpenFlags, Statement, NO_PARAMS};
 use thread_local_object::ThreadLocal;
 
-use crate::constants::ShowEmails;
 use crate::context::Context;
 use crate::dc_tools::*;
 use crate::error::{Error, Result};
@@ -351,7 +348,7 @@ fn open(
     }
 
     if !readonly {
-        let mut exists_before_update = false;
+        let mut exists_before_update = 0;
         let mut dbversion_before_update = 0;
         /* Init tables to dbversion=0 */
         if !sql.table_exists("config") {
@@ -481,7 +478,7 @@ fn open(
                 sql.set_raw_config_int(context, "dbversion", 0)?;
             }
         } else {
-            exists_before_update = true;
+            exists_before_update = 1;
             dbversion_before_update = sql
                 .get_raw_config_int(context, "dbversion")
                 .unwrap_or_default();
@@ -491,7 +488,6 @@ fn open(
         // this should be done before updates that use high-level objects that
         // rely themselves on the low-level structure.
         // --------------------------------------------------------------------
-
         let mut dbversion = dbversion_before_update;
         let mut recalc_fingerprints = 0;
         let mut update_file_paths = 0;
@@ -592,8 +588,6 @@ fn open(
         }
         if dbversion < 27 {
             info!(context, "[migration] v27");
-            // chat.id=1 and chat.id=2 are the old deaddrops,
-            // the current ones are defined by chats.blocked=2
             sql.execute("DELETE FROM msgs WHERE chat_id=1 OR chat_id=2;", params![])?;
             sql.execute(
                 "CREATE INDEX chats_contacts_index2 ON chats_contacts (contact_id);",
@@ -659,9 +653,6 @@ fn open(
                 params![],
             )?;
             if dbversion_before_update == 34 {
-                // migrate database from the use of verified-flags to verified_key,
-                // _only_ version 34 (0.17.0) has the fields public_key_verified and gossip_key_verified
-                // this block can be deleted in half a year or so (created 5/2018)
                 sql.execute(
                     "UPDATE acpeerstates SET verified_key=gossip_key, verified_key_fingerprint=gossip_key_fingerprint WHERE gossip_key_verified=2;",
                     params![]
@@ -691,8 +682,6 @@ fn open(
         }
         if dbversion < 42 {
             info!(context, "[migration] v42");
-            // older versions set the txt-field to the filenames, for debugging and fulltext search.
-            // to allow text+attachment compound messages, we need to reset these fields.
             sql.execute("UPDATE msgs SET txt='' WHERE type!=10", params![])?;
             dbversion = 42;
             sql.set_raw_config_int(context, "dbversion", 42)?;
@@ -746,19 +735,14 @@ fn open(
         }
         if dbversion < 50 {
             info!(context, "[migration] v50");
-            // installations <= 0.100.1 used DC_SHOW_EMAILS_ALL implicitly;
-            // keep this default and use DC_SHOW_EMAILS_NO
-            // only for new installations
-            if exists_before_update {
-                sql.set_raw_config_int(context, "show_emails", ShowEmails::All as i32)?;
+            if 0 != exists_before_update {
+                sql.set_raw_config_int(context, "show_emails", 2)?;
             }
             dbversion = 50;
             sql.set_raw_config_int(context, "dbversion", 50)?;
         }
         if dbversion < 53 {
             info!(context, "[migration] v53");
-            // the messages containing _only_ locations
-            // are also added to the database as _hidden_.
             sql.execute(
                 "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);",
                 params![]
@@ -806,26 +790,9 @@ fn open(
                 "ALTER TABLE locations ADD COLUMN independent INTEGER DEFAULT 0;",
                 params![],
             )?;
+
             sql.set_raw_config_int(context, "dbversion", 55)?;
         }
-        if dbversion < 57 {
-            info!(context, "[migration] v57");
-            // label is a unique name and is currently used for device-messages only.
-            // in contrast to rfc724_mid and other fields, the label is generated on the device
-            // and allows reliable identifications this way.
-            sql.execute(
-                "ALTER TABLE msgs ADD COLUMN label TEXT DEFAULT '';",
-                params![],
-            )?;
-            if exists_before_update && sql.get_raw_config_int(context, "bcc_self").is_none() {
-                sql.set_raw_config_int(context, "bcc_self", 1)?;
-            }
-            sql.set_raw_config_int(context, "dbversion", 57)?;
-        }
-
-        // (2) updates that require high-level objects
-        // (the structure is complete now and all objects are usable)
-        // --------------------------------------------------------------------
 
         if 0 != recalc_fingerprints {
             info!(context, "[migration] recalc fingerprints");
@@ -1172,41 +1139,6 @@ fn maybe_add_from_param(
 #[cfg(test)]
 mod test {
     use super::*;
-    use indoc::indoc;
-
-    #[test]
-    fn test_literals() {
-        // (a) sql formatted with the rust-multiline-literal will easily fail.
-        let a = "SELECT a\
-                 FROM b";
-        assert_eq!(a, "SELECT aFROM b");
-
-        // (b) if used without the trailing backspace, things are fine.
-        let a = "SELECT a
-                 FROM b";
-        assert_eq!(a, "SELECT a\n                 FROM b");
-
-        // (c) sql formatted with the concat-macro with also easily fail.
-        // also you cannot convince `cargo fmt` to align the statements.
-        let a = concat!("SELECT a", "FROM b");
-        assert_eq!(a, "SELECT aFROM b");
-
-        // (d) the indoc-macro keeps lineends so that spaces are not needed.
-        // sqlite treats the lineends as normal whitespace so things are fine.
-        // also `cargo fmt` does not destroy the layout and there is less boilerplate.
-        let a = indoc!(
-            "SELECT a
-             FROM b"
-        );
-        assert_eq!(a, "SELECT a\nFROM b");
-
-        // (e) when adding a trailing backslash, things will fail, though.
-        let a = indoc!(
-            "SELECT a\
-             FROM b"
-        );
-        assert_eq!(a, "SELECT aFROM b");
-    }
 
     #[test]
     fn test_maybe_add_file() {

src/stock.rs

@@ -1,5 +1,3 @@
-//! Module to work with translatable stock strings
-
 use std::borrow::Cow;
 
 use strum::EnumProperty;

src/token.rs

@@ -1,8 +1,4 @@
-//! # Token module
-//!
 //! Functions to read/write token from/to the database. A token is any string associated with a key.
-//!
-//! Tokens are used in countermitm verification protocols.
 
 use deltachat_derive::*;
 
@@ -10,7 +6,7 @@ use crate::context::Context;
 use crate::dc_tools::*;
 use crate::sql;
 
-/// Token namespace
+// Token namespaces
 #[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, ToSql, FromSql)]
 #[repr(i32)]
 pub enum Namespace {
@@ -25,8 +21,6 @@ impl Default for Namespace {
     }
 }
 
-/// Creates a new token and saves it into the database.
-/// Returns created token.
 pub fn save(context: &Context, namespace: Namespace, foreign_id: u32) -> String {
     // foreign_id may be 0
     let token = dc_create_id();

tests/stress.rs

@@ -261,6 +261,22 @@ fn test_stress_tests() {
     }
 }
 
+#[test]
+fn test_get_contacts() {
+    let context = create_test_context();
+    let contacts = Contact::get_all(&context.ctx, 0, Some("some2")).unwrap();
+    assert_eq!(contacts.len(), 0);
+
+    let id = Contact::create(&context.ctx, "bob", "bob@mail.de").unwrap();
+    assert_ne!(id, 0);
+
+    let contacts = Contact::get_all(&context.ctx, 0, Some("bob")).unwrap();
+    assert_eq!(contacts.len(), 1);
+
+    let contacts = Contact::get_all(&context.ctx, 0, Some("alice")).unwrap();
+    assert_eq!(contacts.len(), 0);
+}
+
 #[test]
 fn test_chat() {
     let context = create_test_context();