changelog and version up to 1.0.0-beta.16

fix displayname to use authname when availible

.circleci/config.yml

@@ -187,7 +187,7 @@ workflows:
 
   test:
     jobs:
-      - cargo_fetch
+      # - cargo_fetch
 
       - remote_tests_rust
 
@@ -197,12 +197,12 @@ workflows:
       #     requires:
       #       - build_test_docs_wheel
       #       - build_doxygen
-      - rustfmt:
-          requires:
-            - cargo_fetch
-      - clippy:
-          requires:
-           - cargo_fetch
+      # - rustfmt:
+      #     requires:
+      #       - cargo_fetch
+      # - clippy:
+      #     requires:
+      #      - cargo_fetch
 
       - build_doxygen
 

.github/workflows/code-quality.yml

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

CHANGELOG.md

@@ -1,5 +1,44 @@
 # Changelog 
 
+## 1.0.0-beta.16
+
+- alleviate login problems with providers which only
+  support RSA1024 keys by switching back from Rustls 
+  to native-tls, by using the new async-email/async-native-tls 
+  crate from @dignifiedquire. thanks @link2xt. 
+
+- introduce per-contact profile images to send out 
+  own profile image heuristically, and fix sending
+  out of profile images in "in-prepare" groups. 
+  this also extends the Chat-spec that is maintained
+  in core to specify Chat-Group-Image and Chat-Group-Avatar
+  headers. thanks @r10s and @hpk42.
+
+- fix merging of protected headers from the encrypted
+  to the unencrypted parts, now not happening recursively
+  anymore.  thanks @hpk and @r10s
+
+- fix/optimize autocrypt gossip headers to only get 
+  sent when there are more than 2 people in a chat. 
+  thanks @link2xt
+
+- fix displayname to use the authenticated name 
+  when available (displayname as coming from contacts 
+  themselves). thanks @simon-laux
+
+- introduce preliminary support for offline autoconfig 
+  for nauta provider. thanks @hpk42 @r10s
+
+## 1.0.0-beta.15
+
+- fix #994 attachment appeared doubled in chats (and where actually
+  downloaded after smtp-send). @hpk42
+
+## 1.0.0-beta.14
+
+- fix packaging issue with our rust-email fork, now we are tracking
+  master again there. hpk42
+
 ## 1.0.0-beta.13
 
 - fix #976 -- unicode-issues in display-name of email addresses. @hpk42

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.0.0-beta.13"
+version = "1.0.0-beta.16"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 license = "MPL"
@@ -9,19 +9,19 @@ license = "MPL"
 deltachat_derive = { path = "./deltachat_derive" }
 
 libc = "0.2.51"
-pgp = { git = "https://github.com/rpgp/rpgp", branch = "master", default-features = false }
+pgp = { version = "0.4.0", default-features = false }
 hex = "0.4.0"
 sha2 = "0.8.0"
-rand = "0.6.5"
-smallvec = "0.6.9"
-reqwest = { version = "0.9.15", default-features = false, features = ["rustls-tls"] }
-num-derive = "0.2.5"
+rand = "0.7.0"
+smallvec = "1.0.0"
+reqwest = { version = "0.9.15" }
+num-derive = "0.3.0"
 num-traits = "0.2.6"
-async-smtp = { git = "https://github.com/async-email/async-smtp" }
-email = { git = "https://github.com/deltachat/rust-email", branch = "rfc2047" }
+async-smtp = { git = "https://github.com/async-email/async-smtp", branch = "master" }
+email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "feat/mail" }
-async-imap = { git = "https://github.com/async-email/async-imap", branch="master" }
-async-tls = "0.6"
+async-imap = { git = "https://github.com/async-email/async-imap", branch="native_tls", default-features = false, features = ["tls_native"] }
+async-native-tls = "0.1.1"
 async-std = { version = "1.0", features = ["unstable"] }
 base64 = "0.11"
 charset = "0.1"
@@ -46,17 +46,15 @@ backtrace = "0.3.33"
 byteorder = "1.3.1"
 itertools = "0.8.0"
 image-meta = "0.1.0"
-quick-xml = "0.15.0"
+quick-xml = "0.17.1"
 escaper = "0.1.0"
 bitflags = "1.1.0"
 debug_stub_derive = "0.3.0"
 sanitize-filename = "0.2.1"
 stop-token = { version = "0.1.1", features = ["unstable"] }
-rustls = "0.16.0"
-webpki-roots = "0.18.0"
-webpki = "0.21.0"
 mailparse = "0.10.1"
 encoded-words = { git = "https://github.com/async-email/encoded-words", branch="master" }
+native-tls = "0.2.3"
 
 [dev-dependencies]
 tempfile = "3.0"
@@ -81,6 +79,6 @@ path = "examples/repl/main.rs"
 
 [features]
 default = ["nightly", "ringbuf"]
-vendored = []
+vendored = ["native-tls/vendored", "reqwest/default-tls-vendored"]
 nightly = ["pgp/nightly"]
 ringbuf = ["pgp/ringbuf"]

deltachat-ffi/Cargo.toml

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

deltachat-ffi/deltachat.h

@@ -3645,11 +3645,15 @@ int             dc_contact_is_blocked        (const dc_contact_t* contact);
 
 
 /**
- * Same as dc_contact_is_verified() but allows speeding up things
- * by adding the peerstate belonging to the contact.
- * If you do not have the peerstate available, it is loaded automatically.
+ * Check if a contact was verified. E.g. by a secure-join QR code scan
+ * and if the key has not changed since this verification.
  *
- * @private @memberof dc_context_t
+ * The UI may draw a checkbox or something like that beside verified contacts.
+ *
+ * @memberof dc_contact_t
+ * @param contact The contact object.
+ * @return 0: contact is not verified.
+ *    2: SELF and contact have verified their fingerprints in both directions; in the UI typically checkmarks are shown.
  */
 int             dc_contact_is_verified       (dc_contact_t* contact);
 

examples/repl/cmdline.rs

@@ -938,7 +938,14 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
             let contact = Contact::get_by_id(context, contact_id)?;
             let name_n_addr = contact.get_name_n_addr();
 
-            let mut res = format!("Contact info for: {}:\n\n", name_n_addr);
+            let mut res = format!(
+                "Contact info for: {}:\nIcon: {}\n",
+                name_n_addr,
+                match contact.get_profile_image(context) {
+                    Some(image) => image.to_str().unwrap().to_string(),
+                    None => "NoIcon".to_string(),
+                }
+            );
 
             res += &Contact::get_encrinfo(context, contact_id)?;
 

python/src/deltachat/account.py

@@ -3,6 +3,7 @@
 from __future__ import print_function
 import atexit
 import threading
+import os
 import re
 import time
 from array import array
@@ -94,9 +95,12 @@ class Account(object):
         """
         self._check_config_key(name)
         name = name.encode("utf8")
-        value = value.encode("utf8")
         if name == b"addr" and self.is_configured():
             raise ValueError("can not change 'addr' after account is configured.")
+        if value is not None:
+            value = value.encode("utf8")
+        else:
+            value = ffi.NULL
         lib.dc_set_config(self._dc_context, name, value)
 
     def get_config(self, name):
@@ -132,6 +136,18 @@ class Account(object):
         """
         return lib.dc_is_configured(self._dc_context)
 
+    def set_avatar(self, img_path):
+        """Set self avatar.
+
+        :raises ValueError: if profile image could not be set
+        :returns: None
+        """
+        if img_path is None:
+            self.set_config("selfavatar", None)
+        else:
+            assert os.path.exists(img_path), img_path
+            self.set_config("selfavatar", img_path)
+
     def check_is_configured(self):
         """ Raise ValueError if this account is not configured. """
         if not self.is_configured():

python/src/deltachat/contact.py

@@ -47,3 +47,13 @@ class Contact(object):
     def is_verified(self):
         """ Return True if the contact is verified. """
         return lib.dc_contact_is_verified(self._dc_contact)
+
+    def get_profile_image(self):
+        """Get contact profile image.
+
+        :returns: path to profile image, None if no profile image exists.
+        """
+        dc_res = lib.dc_contact_get_profile_image(self._dc_contact)
+        if dc_res == ffi.NULL:
+            return None
+        return from_dc_charpointer(dc_res)

python/tests/test_account.py

@@ -715,6 +715,12 @@ class TestOnlineAccount:
         assert msg_back.text == "message-back"
         assert msg_back.is_encrypted()
 
+        # Test that we do not gossip peer keys in 1-to-1 chat,
+        # as it makes no sense to gossip to peers their own keys.
+        # Gossip is only sent in encrypted messages,
+        # and we sent encrypted msg_back right above.
+        assert chat2b.get_summary()["gossiped_timestamp"] == 0
+
         lp.sec("create group chat with two members, one of which has no encrypt state")
         chat = ac1.create_group_chat("encryption test")
         chat.add_contact(ac1.create_contact(ac2.get_config("addr")))
@@ -976,7 +982,54 @@ class TestOnlineAccount:
         assert msg.text == "world"
         assert msg.is_encrypted()
 
-    def test_set_get_profile_image(self, acfactory, data, lp):
+    def test_set_get_contact_avatar(self, acfactory, data, lp):
+        lp.sec("configuring ac1 and ac2")
+        ac1, ac2 = acfactory.get_two_online_accounts()
+
+        lp.sec("ac1: set own profile image")
+        p = data.get_path("d.png")
+        ac1.set_avatar(p)
+
+        lp.sec("ac1: create 1:1 chat with ac2")
+        chat = self.get_chat(ac1, ac2, both_created=True)
+
+        msg = chat.send_text("hi -- do you see my brand new avatar?")
+        assert not msg.is_encrypted()
+
+        lp.sec("ac2: wait for receiving message and avatar from ac1")
+        msg1 = ac2.wait_next_incoming_message()
+        assert not msg1.chat.is_deaddrop()
+        received_path = msg1.get_sender_contact().get_profile_image()
+        assert open(received_path, "rb").read() == open(p, "rb").read()
+
+        lp.sec("ac2: set own profile image")
+        p = data.get_path("d.png")
+        ac2.set_avatar(p)
+
+        lp.sec("ac2: send back message")
+        m = msg1.chat.send_text("yes, i received your avatar -- how do you like mine?")
+        assert m.is_encrypted()
+
+        lp.sec("ac1: wait for receiving message and avatar from ac2")
+        msg2 = ac1.wait_next_incoming_message()
+        received_path = msg2.get_sender_contact().get_profile_image()
+        assert received_path is not None, "did not get avatar through encrypted message"
+        assert open(received_path, "rb").read() == open(p, "rb").read()
+
+        ac2._evlogger.consume_events()
+        ac1._evlogger.consume_events()
+
+        # XXX not sure if the following is correct / possible. you may remove it
+        lp.sec("ac1: delete profile image from chat, and send message to ac2")
+        ac1.set_avatar(None)
+        m = msg2.chat.send_text("i don't like my avatar anymore and removed it")
+        assert m.is_encrypted()
+
+        lp.sec("ac2: wait for message along with avatar deletion of ac1")
+        msg3 = ac2.wait_next_incoming_message()
+        assert msg3.get_sender_contact().get_profile_image() is None
+
+    def test_set_get_group_image(self, acfactory, data, lp):
         ac1, ac2 = acfactory.get_two_online_accounts()
 
         lp.sec("create unpromoted group chat")

set_core_version.py

@@ -55,6 +55,7 @@ if __name__ == "__main__":
     replace_toml_version("Cargo.toml", newversion)
     replace_toml_version("deltachat-ffi/Cargo.toml", newversion)
 
+    subprocess.call(["git", "add", "-u"])
     # subprocess.call(["cargo", "update", "-p", "deltachat"])
 
     print("after commit make sure to: ")

spec.md

@@ -1,6 +1,6 @@
 # Chat-over-Email specification
 
-Version 0.19.0
+Version 0.20.0
 
 This document describes how emails can be used
 to implement typical messenger functions
@@ -248,11 +248,11 @@ and the message SHOULD appear as a message or action from the sender.
 A group MAY have a group-image.
 To change or set the group-image,
 the messenger MUST attach an image file to a message
-and MUST add the header `Chat-Group-Image`
+and MUST add the header `Chat-Group-Avatar`
 with the value set to the image name.
 
 To remove the group-image,
-the messenger MUST add the header `Chat-Group-Image: 0`.
+the messenger MUST add the header `Chat-Group-Avatar: 0`.
 
 The messenger SHOULD send an explicit mail for each group image change.
 The body of the message SHOULD contain
@@ -265,7 +265,7 @@ and the message SHOULD appear as a message or action from the sender.
     Chat-Version: 1.0
     Chat-Group-ID: 12345uvwxyZ
     Chat-Group-Name: Our Group
-    Chat-Group-Image: image.jpg
+    Chat-Group-Avatar: image.jpg
     Message-ID: Gr.12345uvwxyZ.0005@domain
     Subject: Chat: Our Group: Hello, ...
     Content-Type: multipart/mixed; boundary="==break=="
@@ -283,25 +283,25 @@ and the message SHOULD appear as a message or action from the sender.
 
 The image format SHOULD be image/jpeg or image/png.
 To save data, it is RECOMMENDED
-to add a `Chat-Group-Image` only on image changes.
+to add a `Chat-Group-Avatar` only on image changes.
 
 
 # Set profile image
 
-A user MAY have a profile-image that MAY be spread to his contacts.
+A user MAY have a profile-image that MAY be spread to their contacts.
 To change or set the profile-image,
 the messenger MUST attach an image file to a message
-and MUST add the header `Chat-Profile-Image`
+and MUST add the header `Chat-User-Avatar`
 with the value set to the image name.
 
 To remove the profile-image,
-the messenger MUST add the header `Chat-Profile-Image: 0`.
+the messenger MUST add the header `Chat-User-Avatar: 0`.
 
 To spread the image,
 the messenger MAY send the profile image
 together with the next mail to a given contact
 (to do this only once,
-the messenger has to keep a `profile_image_update_state` somewhere).
+the messenger has to keep a `user_avatar_update_state` somewhere).
 Alternatively, the messenger MAY send an explicit mail
 for each profile-image change to all contacts using a compatible messenger.
 The messenger SHOULD NOT send an explicit mail to normal MUAs.
@@ -309,7 +309,7 @@ The messenger SHOULD NOT send an explicit mail to normal MUAs.
     From: sender@domain
     To: rcpt@domain
     Chat-Version: 1.0
-    Chat-Profile-Image: photo.jpg
+    Chat-User-Avatar: photo.jpg
     Subject: Chat: Hello, ...
     Content-Type: multipart/mixed; boundary="==break=="
 
@@ -325,10 +325,10 @@ The messenger SHOULD NOT send an explicit mail to normal MUAs.
     --==break==--
 
 The image format SHOULD be image/jpeg or image/png.
-Note that `Chat-Profile-Image` may appear together with all other headers,
-eg. there may be a `Chat-Profile-Image` and a `Chat-Group-Image` header
+Note that `Chat-User-Avatar` may appear together with all other headers,
+eg. there may be a `Chat-User-Avatar` and a `Chat-Group-Avatar` header
 in the same message.
-To save data, it is RECOMMENDED to add a `Chat-Profile-Image` header
+To save data, it is RECOMMENDED to add a `Chat-User-Avatar` header
 only on image changes.
 
 

src/chat.rs

@@ -35,7 +35,6 @@ pub struct Chat {
     pub grpid: String,
     blocked: Blocked,
     pub param: Params,
-    pub gossiped_timestamp: i64,
     is_sending_locations: bool,
 }
 
@@ -44,7 +43,7 @@ impl Chat {
     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, \
-             c.blocked, c.gossiped_timestamp, c.locations_send_until  \
+             c.blocked, c.locations_send_until  \
              FROM chats c WHERE c.id=?;",
             params![chat_id as i32],
             |row| {
@@ -56,8 +55,7 @@ impl Chat {
                     param: row.get::<_, String>(4)?.parse().unwrap_or_default(),
                     archived: row.get(5)?,
                     blocked: row.get::<_, Option<_>>(6)?.unwrap_or_default(),
-                    gossiped_timestamp: row.get(7)?,
-                    is_sending_locations: row.get(8)?,
+                    is_sending_locations: row.get(7)?,
                 };
 
                 Ok(c)
@@ -216,6 +214,10 @@ impl Chat {
         None
     }
 
+    pub fn get_gossiped_timestamp(&self, context: &Context) -> i64 {
+        get_gossiped_timestamp(context, self.id)
+    }
+
     pub fn get_color(&self, context: &Context) -> u32 {
         let mut color = 0;
 
@@ -310,10 +312,10 @@ impl Chat {
                         self.id
                     );
                 }
-            } else if self.typ == Chattype::Group
-                || self.typ == Chattype::VerifiedGroup
-                    && self.param.get_int(Param::Unpromoted).unwrap_or_default() == 1
+            } else if (self.typ == Chattype::Group || self.typ == Chattype::VerifiedGroup)
+                && self.param.get_int(Param::Unpromoted).unwrap_or_default() == 1
             {
+                msg.param.set_int(Param::AttachGroupImage, 1);
                 self.param.remove(Param::Unpromoted);
                 self.update_param(context)?;
             }
@@ -593,12 +595,6 @@ pub fn set_blocking(context: &Context, chat_id: u32, new_blocking: Blocked) -> b
     .is_ok()
 }
 
-fn copy_device_icon_to_blobs(context: &Context) -> Result<String, Error> {
-    let icon = include_bytes!("../assets/icon-device.png");
-    let blob = BlobObject::create(context, "icon-device.png".to_string(), icon)?;
-    Ok(blob.as_name().to_string())
-}
-
 pub fn update_saved_messages_icon(context: &Context) -> Result<(), Error> {
     // if there is no saved-messages chat, there is nothing to update. this is no error.
     if let Ok((chat_id, _)) = lookup_by_contact_id(context, DC_CONTACT_ID_SELF) {
@@ -613,6 +609,24 @@ pub fn update_saved_messages_icon(context: &Context) -> Result<(), Error> {
     Ok(())
 }
 
+pub fn update_device_icon(context: &Context) -> Result<(), Error> {
+    // if there is no device-chat, there is nothing to update. this is no error.
+    if let Ok((chat_id, _)) = lookup_by_contact_id(context, DC_CONTACT_ID_DEVICE) {
+        let icon = include_bytes!("../assets/icon-device.png");
+        let blob = BlobObject::create(context, "icon-device.png".to_string(), icon)?;
+        let icon = blob.as_name().to_string();
+
+        let mut chat = Chat::load_from_db(context, chat_id)?;
+        chat.param.set(Param::ProfileImage, &icon);
+        chat.update_param(context)?;
+
+        let mut contact = Contact::load_from_db(context, DC_CONTACT_ID_DEVICE)?;
+        contact.param.set(Param::ProfileImage, icon);
+        contact.update_param(context)?;
+    }
+    Ok(())
+}
+
 pub fn create_or_lookup_by_contact_id(
     context: &Context,
     contact_id: u32,
@@ -638,10 +652,7 @@ pub fn create_or_lookup_by_contact_id(
             chat_name,
             match contact_id {
                 DC_CONTACT_ID_SELF => "K=1".to_string(), // K = Param::Selftalk
-                DC_CONTACT_ID_DEVICE => {
-                    let icon = copy_device_icon_to_blobs(context)?;
-                    format!("D=1\ni={}", icon) // D = Param::Devicetalk, i = Param::ProfileImage
-                },
+                DC_CONTACT_ID_DEVICE => "D=1".to_string(), // D = Param::Devicetalk
                 _ => "".to_string()
             },
             create_blocked as u8,
@@ -665,6 +676,8 @@ pub fn create_or_lookup_by_contact_id(
 
     if contact_id == DC_CONTACT_ID_SELF {
         update_saved_messages_icon(context)?;
+    } else if contact_id == DC_CONTACT_ID_DEVICE {
+        update_device_icon(context)?;
     }
 
     Ok((chat_id, create_blocked))
@@ -1454,7 +1467,7 @@ pub(crate) fn add_contact_to_chat_ex(
     let contact = Contact::get_by_id(context, contact_id)?;
     let mut msg = Message::default();
 
-    reset_gossiped_timestamp(context, chat_id);
+    reset_gossiped_timestamp(context, chat_id)?;
 
     /*this also makes sure, not contacts are added to special or normal chats*/
     let mut chat = Chat::load_from_db(context, chat_id)?;
@@ -1552,12 +1565,28 @@ fn real_group_exists(context: &Context, chat_id: u32) -> bool {
         .unwrap_or_default()
 }
 
-pub fn reset_gossiped_timestamp(context: &Context, chat_id: u32) {
-    set_gossiped_timestamp(context, chat_id, 0);
+pub fn reset_gossiped_timestamp(context: &Context, chat_id: u32) -> crate::sql::Result<()> {
+    set_gossiped_timestamp(context, chat_id, 0)
 }
 
-// Should return Result
-pub fn set_gossiped_timestamp(context: &Context, chat_id: u32, timestamp: i64) {
+/// Get timestamp of the last gossip sent in the chat.
+/// Zero return value means that gossip was never sent.
+pub fn get_gossiped_timestamp(context: &Context, chat_id: u32) -> i64 {
+    context
+        .sql
+        .query_get_value::<_, i64>(
+            context,
+            "SELECT gossiped_timestamp FROM chats WHERE id=?;",
+            params![chat_id as i32],
+        )
+        .unwrap_or_default()
+}
+
+pub fn set_gossiped_timestamp(
+    context: &Context,
+    chat_id: u32,
+    timestamp: i64,
+) -> crate::sql::Result<()> {
     if 0 != chat_id {
         info!(
             context,
@@ -1570,7 +1599,6 @@ pub fn set_gossiped_timestamp(context: &Context, chat_id: u32, timestamp: i64) {
             "UPDATE chats SET gossiped_timestamp=? WHERE id=?;",
             params![timestamp, chat_id as i32],
         )
-        .ok();
     } else {
         info!(
             context,
@@ -1582,10 +1610,58 @@ pub fn set_gossiped_timestamp(context: &Context, chat_id: u32, timestamp: i64) {
             "UPDATE chats SET gossiped_timestamp=?;",
             params![timestamp],
         )
-        .ok();
     }
 }
 
+pub fn shall_attach_selfavatar(context: &Context, chat_id: u32) -> Result<bool, Error> {
+    // versions before 12/2019 already allowed to set selfavatar, however, it was never sent to others.
+    // to avoid sending out previously set selfavatars unexpectedly we added this additional check.
+    // it can be removed after some time.
+    if !context
+        .sql
+        .get_raw_config_bool(context, "attach_selfavatar")
+    {
+        return Ok(false);
+    }
+
+    let timestamp_some_days_ago = time() - DC_RESEND_USER_AVATAR_DAYS * 24 * 60 * 60;
+    let needs_attach = context.sql.query_map(
+        "SELECT c.selfavatar_sent
+           FROM chats_contacts cc
+           LEFT JOIN contacts c ON c.id=cc.contact_id
+          WHERE cc.chat_id=? AND cc.contact_id!=?;",
+        params![chat_id, DC_CONTACT_ID_SELF],
+        |row| Ok(row.get::<_, i64>(0)),
+        |rows| {
+            let mut needs_attach = false;
+            for row in rows {
+                if let Ok(selfavatar_sent) = row {
+                    let selfavatar_sent = selfavatar_sent?;
+                    if selfavatar_sent < timestamp_some_days_ago {
+                        needs_attach = true;
+                    }
+                }
+            }
+            Ok(needs_attach)
+        },
+    )?;
+    Ok(needs_attach)
+}
+
+pub fn set_selfavatar_timestamp(
+    context: &Context,
+    chat_id: u32,
+    timestamp: i64,
+) -> Result<(), Error> {
+    context.sql.execute(
+        "UPDATE contacts
+            SET selfavatar_sent=?
+          WHERE id IN(SELECT contact_id FROM chats_contacts WHERE chat_id=?);",
+        params![timestamp, chat_id],
+    )?;
+    Ok(())
+}
+
 pub fn remove_contact_from_chat(
     context: &Context,
     chat_id: u32,
@@ -1942,7 +2018,7 @@ pub fn get_info_json(context: &Context, chat_id: u32) -> Result<String, Error> {
          "name": chat.name,
          "archived": chat.archived,
          "param": chat.param.to_string(),
-         "gossiped_timestamp": chat.gossiped_timestamp,
+         "gossiped_timestamp": chat.get_gossiped_timestamp(context),
          "is_sending_locations": chat.is_sending_locations,
          "color": chat.get_color(context),
          "profile_image": profile_image,
@@ -2424,4 +2500,21 @@ mod tests {
 
         assert_eq!(chat2.name, chat.name);
     }
+
+    #[test]
+    fn test_shall_attach_selfavatar() {
+        let t = dummy_context();
+        let chat_id = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "foo").unwrap();
+        assert!(!shall_attach_selfavatar(&t.ctx, chat_id).unwrap());
+
+        let (contact_id, _) =
+            Contact::add_or_lookup(&t.ctx, "", "foo@bar.org", Origin::IncomingUnknownTo).unwrap();
+        add_contact_to_chat(&t.ctx, chat_id, contact_id);
+        assert!(!shall_attach_selfavatar(&t.ctx, chat_id).unwrap());
+        t.ctx.set_config(Config::Selfavatar, None).unwrap(); // setting to None also forces re-sending
+        assert!(shall_attach_selfavatar(&t.ctx, chat_id).unwrap());
+
+        assert!(set_selfavatar_timestamp(&t.ctx, chat_id, time()).is_ok());
+        assert!(!shall_attach_selfavatar(&t.ctx, chat_id).unwrap());
+    }
 }

src/config.rs

@@ -9,6 +9,7 @@ use crate::context::Context;
 use crate::dc_tools::*;
 use crate::job::*;
 use crate::stock::StockMessage;
+use rusqlite::NO_PARAMS;
 
 /// The available configuration keys.
 #[derive(
@@ -127,9 +128,18 @@ impl Context {
     /// If `None` is passed as a value the value is cleared and set to the default if there is one.
     pub fn set_config(&self, key: Config, value: Option<&str>) -> crate::sql::Result<()> {
         match key {
-            Config::Selfavatar if value.is_some() => {
-                let blob = BlobObject::new_from_path(&self, value.unwrap())?;
-                self.sql.set_raw_config(self, key, Some(blob.as_name()))
+            Config::Selfavatar => {
+                self.sql
+                    .execute("UPDATE contacts SET selfavatar_sent=0;", NO_PARAMS)?;
+                self.sql
+                    .set_raw_config_bool(self, "attach_selfavatar", true)?;
+                match value {
+                    Some(value) => {
+                        let blob = BlobObject::new_from_path(&self, value)?;
+                        self.sql.set_raw_config(self, key, Some(blob.as_name()))
+                    }
+                    None => self.sql.set_raw_config(self, key, None),
+                }
             }
             Config::InboxWatch => {
                 let ret = self.sql.set_raw_config(self, key, value);

src/configure/mod.rs

@@ -12,7 +12,7 @@ use crate::context::Context;
 use crate::dc_tools::*;
 use crate::e2ee;
 use crate::job::*;
-use crate::login_param::LoginParam;
+use crate::login_param::{CertificateChecks, LoginParam};
 use crate::oauth2::*;
 use crate::param::Params;
 
@@ -92,9 +92,11 @@ pub fn JobConfigureImap(context: &Context) {
     let mut param_domain = "undefined.undefined".to_owned();
     let mut param_addr_urlencoded: String =
         "Internal Error: this value should never be used".to_owned();
-    let mut keep_flags = std::i32::MAX;
+    let mut keep_flags = 0;
+
+    const STEP_12_USE_AUTOCONFIG: u8 = 12;
+    const STEP_13_AFTER_AUTOCONFIG: u8 = 13;
 
-    const STEP_3_INDEX: u8 = 13;
     let mut step_counter: u8 = 0;
     while !context.shall_stop_ongoing() {
         step_counter += 1;
@@ -110,7 +112,7 @@ pub fn JobConfigureImap(context: &Context) {
             }
             // Step 1: Load the parameters and check email-address and password
             2 => {
-                if 0 != param.server_flags & 0x2 {
+                if 0 != param.server_flags & DC_LP_AUTH_OAUTH2 {
                     // the used oauth2 addr may differ, check this.
                     // if dc_get_oauth2_addr() is not available in the oauth2 implementation,
                     // just use the given one.
@@ -145,6 +147,7 @@ pub fn JobConfigureImap(context: &Context) {
             // Step 2: Autoconfig
             4 => {
                 progress!(context, 200);
+
                 if param.mail_server.is_empty()
                             && param.mail_port == 0
                             /*&&param.mail_user.is_empty() -- the user can enter a loginname which is used by autoconfig then */
@@ -152,12 +155,18 @@ pub fn JobConfigureImap(context: &Context) {
                             && param.send_port == 0
                             && param.send_user.is_empty()
                             /*&&param.send_pw.is_empty() -- the password cannot be auto-configured and is no criterion for autoconfig or not */
-                            && param.server_flags & !0x2 == 0
+                            && (param.server_flags & !DC_LP_AUTH_OAUTH2) == 0
                 {
-                    keep_flags = param.server_flags & 0x2;
+                    // no advanced parameters entered by the user: query provider-database or do Autoconfig
+                    keep_flags = param.server_flags & DC_LP_AUTH_OAUTH2;
+                    if let Some(new_param) = get_offline_autoconfig(context, &param) {
+                        // got parameters from our provider-database, skip Autoconfig, preserve the OAuth2 setting
+                        param_autoconfig = Some(new_param);
+                        step_counter = STEP_12_USE_AUTOCONFIG - 1; // minus one as step_counter is increased on next loop
+                    }
                 } else {
-                    // Autoconfig is not needed so skip it.
-                    step_counter = STEP_3_INDEX - 1;
+                    // advanced parameters entered by the user: skip Autoconfig
+                    step_counter = STEP_13_AFTER_AUTOCONFIG - 1; // minus one as step_counter is increased on next loop
                 }
                 true
             }
@@ -242,8 +251,10 @@ pub fn JobConfigureImap(context: &Context) {
                 }
                 true
             }
-            /* C.  Do we have any result? */
-            12 => {
+            /* C.  Do we have any autoconfig result?
+               If you change the match-number here, also update STEP_12_COPY_AUTOCONFIG above
+            */
+            STEP_12_USE_AUTOCONFIG => {
                 progress!(context, 500);
                 if let Some(ref cfg) = param_autoconfig {
                     info!(context, "Got autoconfig: {}", &cfg);
@@ -256,15 +267,15 @@ pub fn JobConfigureImap(context: &Context) {
                     param.send_port = cfg.send_port;
                     param.send_user = cfg.send_user.clone();
                     param.server_flags = cfg.server_flags;
-                    /* although param_autoconfig's data are no longer needed from, it is important to keep the object as
-                    we may enter "deep guessing" if we could not read a configuration */
+                    /* although param_autoconfig's data are no longer needed from,
+                    it is used to later to prevent trying variations of port/server/logins */
                 }
                 param.server_flags |= keep_flags;
                 true
             }
             // Step 3: Fill missing fields with defaults
-            13 => {
-                // if you move this, don't forget to update STEP_3_INDEX, too
+            // If you change the match-number here, also update STEP_13_AFTER_AUTOCONFIG above
+            STEP_13_AFTER_AUTOCONFIG => {
                 if param.mail_server.is_empty() {
                     param.mail_server = format!("imap.{}", param_domain,)
                 }
@@ -430,6 +441,42 @@ pub fn JobConfigureImap(context: &Context) {
     progress!(context, if success { 1000 } else { 0 });
 }
 
+fn get_offline_autoconfig(context: &Context, param: &LoginParam) -> Option<LoginParam> {
+    // XXX we don't have https://github.com/deltachat/provider-db  APIs
+    // integrated yet but we'll already add nauta as a first use case, also
+    // showing what we need from provider-db in the future.
+    info!(
+        context,
+        "checking internal provider-info for offline autoconfig"
+    );
+
+    if param.addr.ends_with("@nauta.cu") {
+        let mut p = LoginParam::new();
+
+        p.addr = param.addr.clone();
+        p.mail_server = "imap.nauta.cu".to_string();
+        p.mail_user = param.addr.clone();
+        p.mail_pw = param.mail_pw.clone();
+        p.mail_port = 143;
+        p.imap_certificate_checks = CertificateChecks::AcceptInvalidCertificates;
+
+        p.send_server = "smtp.nauta.cu".to_string();
+        p.send_user = param.addr.clone();
+        p.send_pw = param.mail_pw.clone();
+        p.send_port = 25;
+        p.smtp_certificate_checks = CertificateChecks::AcceptInvalidCertificates;
+        p.server_flags = DC_LP_AUTH_NORMAL as i32
+            | DC_LP_IMAP_SOCKET_STARTTLS as i32
+            | DC_LP_SMTP_SOCKET_STARTTLS as i32;
+
+        info!(context, "found offline autoconfig: {}", p);
+        Some(p)
+    } else {
+        info!(context, "no offline autoconfig found");
+        None
+    }
+}
+
 fn try_imap_connections(
     context: &Context,
     mut param: &mut LoginParam,
@@ -571,6 +618,7 @@ fn try_smtp_one_param(context: &Context, param: &LoginParam) -> Option<bool> {
 #[cfg(test)]
 mod tests {
 
+    use super::*;
     use crate::config::*;
     use crate::configure::JobConfigureImap;
     use crate::test_utils::*;
@@ -584,4 +632,19 @@ mod tests {
         t.ctx.set_config(Config::MailPw, Some("123456")).unwrap();
         JobConfigureImap(&t.ctx);
     }
+
+    #[test]
+    fn test_get_offline_autoconfig() {
+        let context = dummy_context().ctx;
+
+        let mut params = LoginParam::new();
+        params.addr = "someone123@example.org".to_string();
+        assert!(get_offline_autoconfig(&context, &params).is_none());
+
+        let mut params = LoginParam::new();
+        params.addr = "someone123@nauta.cu".to_string();
+        let found_params = get_offline_autoconfig(&context, &params).unwrap();
+        assert_eq!(found_params.mail_server, "imap.nauta.cu".to_string());
+        assert_eq!(found_params.send_server, "smtp.nauta.cu".to_string());
+    }
 }

src/constants.rs

@@ -58,6 +58,9 @@ pub const DC_GCM_ADDDAYMARKER: u32 = 0x01;
 pub const DC_GCL_VERIFIED_ONLY: usize = 0x01;
 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;
+
 // values for DC_PARAM_FORCE_PLAINTEXT
 pub(crate) const DC_FP_NO_AUTOCRYPT_HEADER: i32 = 2;
 pub(crate) const DC_FP_ADD_AUTOCRYPT_HEADER: i32 = 1;
@@ -119,6 +122,10 @@ pub const DC_CONTACT_ID_INFO: u32 = 2;
 pub const DC_CONTACT_ID_DEVICE: u32 = 5;
 pub const DC_CONTACT_ID_LAST_SPECIAL: u32 = 9;
 
+// decorative address that is used for DC_CONTACT_ID_DEVICE
+// when an api that returns an email is called.
+pub const DC_CONTACT_ID_DEVICE_ADDR: &str = "device@localhost";
+
 // Flags for empty server job
 
 pub const DC_EMPTY_MVBOX: u32 = 0x01;

src/contact.rs

@@ -15,6 +15,8 @@ use crate::events::Event;
 use crate::key::*;
 use crate::login_param::LoginParam;
 use crate::message::{MessageState, MsgId};
+use crate::mimeparser::AvatarAction;
+use crate::param::*;
 use crate::peerstate::*;
 use crate::sql;
 use crate::stock::StockMessage;
@@ -58,6 +60,8 @@ pub struct Contact {
     blocked: bool,
     /// The origin/source of the contact.
     pub origin: Origin,
+    /// Parameters as Param::ProfileImage
+    pub param: Params,
 }
 
 /// Possible origins of a contact.
@@ -139,32 +143,10 @@ pub enum VerifiedStatus {
 
 impl Contact {
     pub fn load_from_db(context: &Context, contact_id: u32) -> crate::sql::Result<Self> {
-        if contact_id == DC_CONTACT_ID_SELF {
-            let contact = Contact {
-                id: contact_id,
-                name: context.stock_str(StockMessage::SelfMsg).into(),
-                authname: "".into(),
-                addr: context
-                    .get_config(Config::ConfiguredAddr)
-                    .unwrap_or_default(),
-                blocked: false,
-                origin: Origin::Unknown,
-            };
-            return Ok(contact);
-        } else if contact_id == DC_CONTACT_ID_DEVICE {
-            let contact = Contact {
-                id: contact_id,
-                name: context.stock_str(StockMessage::DeviceMessages).into(),
-                authname: "".into(),
-                addr: "device@localhost".into(),
-                blocked: false,
-                origin: Origin::Unknown,
-            };
-            return Ok(contact);
-        }
-
-        context.sql.query_row(
-            "SELECT c.name, c.addr, c.origin, c.blocked, c.authname  FROM contacts c  WHERE c.id=?;",
+        let mut res = context.sql.query_row(
+            "SELECT c.name, c.addr, c.origin, c.blocked, c.authname, c.param
+               FROM contacts c
+              WHERE c.id=?;",
             params![contact_id as i32],
             |row| {
                 let contact = Self {
@@ -174,10 +156,21 @@ impl Contact {
                     addr: row.get::<_, String>(1)?,
                     blocked: row.get::<_, Option<i32>>(3)?.unwrap_or_default() != 0,
                     origin: row.get(2)?,
+                    param: row.get::<_, String>(5)?.parse().unwrap_or_default(),
                 };
                 Ok(contact)
-            }
-        )
+            },
+        )?;
+        if contact_id == DC_CONTACT_ID_SELF {
+            res.name = context.stock_str(StockMessage::SelfMsg).to_string();
+            res.addr = context
+                .get_config(Config::ConfiguredAddr)
+                .unwrap_or_default();
+        } else if contact_id == DC_CONTACT_ID_DEVICE {
+            res.name = context.stock_str(StockMessage::DeviceMessages).to_string();
+            res.addr = DC_CONTACT_ID_DEVICE_ADDR.to_string();
+        }
+        Ok(res)
     }
 
     /// Returns `true` if this contact is blocked.
@@ -709,6 +702,16 @@ impl Contact {
         Ok(Contact::load_from_db(context, contact_id)?)
     }
 
+    pub fn update_param(&mut self, context: &Context) -> Result<()> {
+        sql::execute(
+            context,
+            &context.sql,
+            "UPDATE contacts SET param=? WHERE id=?",
+            params![self.param.to_string(), self.id as i32],
+        )?;
+        Ok(())
+    }
+
     /// Get the ID of the contact.
     pub fn get_id(&self) -> u32 {
         self.id
@@ -742,6 +745,9 @@ impl Contact {
         if !self.name.is_empty() {
             return &self.name;
         }
+        if !self.authname.is_empty() {
+            return &self.authname;
+        }
         &self.addr
     }
 
@@ -777,8 +783,11 @@ impl Contact {
             if let Some(p) = context.get_config(Config::Selfavatar) {
                 return Some(PathBuf::from(p));
             }
+        } else if let Some(image_rel) = self.param.get(Param::ProfileImage) {
+            if !image_rel.is_empty() {
+                return Some(dc_get_abs_path(context, image_rel));
+            }
         }
-        // TODO: else get image_abs from contact param
         None
     }
 
@@ -957,6 +966,32 @@ fn set_block_contact(context: &Context, contact_id: u32, new_blocking: bool) {
     }
 }
 
+pub fn set_profile_image(
+    context: &Context,
+    contact_id: u32,
+    profile_image: AvatarAction,
+) -> Result<()> {
+    // the given profile image is expected to be already in the blob directory
+    // as profile images can be set only by receiving messages, this should be always the case, however.
+    let mut contact = Contact::load_from_db(context, contact_id)?;
+    let changed = match profile_image {
+        AvatarAction::Change(profile_image) => {
+            contact.param.set(Param::ProfileImage, profile_image);
+            true
+        }
+        AvatarAction::Delete => {
+            contact.param.remove(Param::ProfileImage);
+            true
+        }
+        AvatarAction::None => false,
+    };
+    if changed {
+        contact.update_param(context)?;
+        context.call_cb(Event::ContactsChanged(Some(contact_id)));
+    }
+    Ok(())
+}
+
 /// Normalize a name.
 ///
 /// - Remove quotes (come from some bad MUA implementations)

src/context.rs

@@ -298,6 +298,11 @@ impl Context {
         res.insert("database_version", dbversion.to_string());
         res.insert("blobdir", self.get_blobdir().display().to_string());
         res.insert("display_name", displayname.unwrap_or_else(|| unset.into()));
+        res.insert(
+            "selfavatar",
+            self.get_config(Config::Selfavatar)
+                .unwrap_or_else(|| "<unset>".to_string()),
+        );
         res.insert("is_configured", is_configured.to_string());
         res.insert("entered_account_settings", l.to_string());
         res.insert("used_account_settings", l2.to_string());

src/dc_receive_imf.rs

@@ -3,7 +3,6 @@ use sha2::{Digest, Sha256};
 
 use num_traits::FromPrimitive;
 
-use crate::blob::BlobObject;
 use crate::chat::{self, Chat};
 use crate::config::Config;
 use crate::constants::*;
@@ -14,7 +13,6 @@ use crate::error::Result;
 use crate::events::Event;
 use crate::headerdef::HeaderDef;
 use crate::job::*;
-use crate::location;
 use crate::message::{self, MessageState, MsgId};
 use crate::mimeparser::*;
 use crate::param::*;
@@ -22,6 +20,7 @@ use crate::peerstate::*;
 use crate::securejoin::handle_securejoin_handshake;
 use crate::sql;
 use crate::stock::StockMessage;
+use crate::{contact, location};
 
 // IndexSet is like HashSet but maintains order of insertion
 type ContactIds = indexmap::IndexSet<u32>;
@@ -238,6 +237,17 @@ pub fn dc_receive_imf(
         );
     }
 
+    if mime_parser.user_avatar != AvatarAction::None {
+        match contact::set_profile_image(&context, from_id, mime_parser.user_avatar) {
+            Ok(()) => {
+                context.call_cb(Event::ChatModified(chat_id));
+            }
+            Err(err) => {
+                warn!(context, "reveive_imf cannot update profile image: {}", err);
+            }
+        };
+    }
+
     // if we delete we don't need to try moving messages
     if needs_delete_job && !created_db_entries.is_empty() {
         job_add(
@@ -797,7 +807,6 @@ fn create_or_lookup_group(
     let mut X_MrRemoveFromGrp = None;
     let mut X_MrAddToGrp = None;
     let mut X_MrGrpNameChanged = false;
-    let mut X_MrGrpImageChanged = "".to_string();
     let mut better_msg: String = From::from("");
 
     if mime_parser.is_system_message == SystemMessage::LocationStreamingEnabled {
@@ -864,9 +873,6 @@ fn create_or_lookup_group(
         if let Some(optional_field) = field {
             X_MrAddToGrp = Some(optional_field);
             mime_parser.is_system_message = SystemMessage::MemberAddedToGroup;
-            if let Some(optional_field) = mime_parser.get(HeaderDef::ChatGroupImage).cloned() {
-                X_MrGrpImageChanged = optional_field;
-            }
             better_msg = context.stock_system_msg(
                 StockMessage::MsgAddMember,
                 X_MrAddToGrp.as_ref().unwrap(),
@@ -889,21 +895,23 @@ fn create_or_lookup_group(
                 );
 
                 mime_parser.is_system_message = SystemMessage::GroupNameChanged;
-            } else if let Some(optional_field) = mime_parser.get(HeaderDef::ChatGroupImage).cloned()
-            {
-                // fld_value is a pointer somewhere into mime_parser, must not be freed
-                X_MrGrpImageChanged = optional_field;
-                mime_parser.is_system_message = SystemMessage::GroupImageChanged;
-                better_msg = context.stock_system_msg(
-                    if X_MrGrpImageChanged == "0" {
-                        StockMessage::MsgGrpImgDeleted
-                    } else {
-                        StockMessage::MsgGrpImgChanged
-                    },
-                    "",
-                    "",
-                    from_id as u32,
-                )
+            } else if let Some(value) = mime_parser.get(HeaderDef::ChatContent) {
+                if value == "group-avatar-changed" && mime_parser.group_avatar != AvatarAction::None
+                {
+                    // this is just an explicit message containing the group-avatar,
+                    // apart from that, the group-avatar is send along with various other messages
+                    mime_parser.is_system_message = SystemMessage::GroupImageChanged;
+                    better_msg = context.stock_system_msg(
+                        if mime_parser.group_avatar == AvatarAction::Delete {
+                            StockMessage::MsgGrpImgDeleted
+                        } else {
+                            StockMessage::MsgGrpImgChanged
+                        },
+                        "",
+                        "",
+                        from_id as u32,
+                    )
+                }
             }
         }
     }
@@ -1026,44 +1034,20 @@ fn create_or_lookup_group(
             }
         }
     }
-    if !X_MrGrpImageChanged.is_empty() {
-        info!(
-            context,
-            "grp-image-change {} chat {}", X_MrGrpImageChanged, chat_id
-        );
-        let mut changed = false;
-        let mut grpimage: Option<BlobObject> = None;
-        if X_MrGrpImageChanged == "0" {
-            changed = true;
-        } else {
-            for part in &mut mime_parser.parts {
-                if part.typ == Viewtype::Image {
-                    grpimage = part
-                        .param
-                        .get_blob(Param::File, context, true)
-                        .unwrap_or(None);
-                    info!(context, "found image {:?}", grpimage);
-                    changed = true;
+    if mime_parser.group_avatar != AvatarAction::None {
+        info!(context, "group-avatar change for {}", chat_id);
+        if let Ok(mut chat) = Chat::load_from_db(context, chat_id) {
+            match &mime_parser.group_avatar {
+                AvatarAction::Change(profile_image) => {
+                    chat.param.set(Param::ProfileImage, profile_image);
                 }
-            }
-        }
-        if changed {
-            info!(
-                context,
-                "New group image set to '{}'.",
-                grpimage
-                    .as_ref()
-                    .map(|blob| blob.as_name().to_string())
-                    .unwrap_or_default()
-            );
-            if let Ok(mut chat) = Chat::load_from_db(context, chat_id) {
-                match grpimage {
-                    Some(blob) => chat.param.set(Param::ProfileImage, blob.as_name()),
-                    None => chat.param.remove(Param::ProfileImage),
-                };
-                chat.update_param(context)?;
-                send_EVENT_CHAT_MODIFIED = true;
-            }
+                AvatarAction::Delete => {
+                    chat.param.remove(Param::ProfileImage);
+                }
+                AvatarAction::None => {}
+            };
+            chat.update_param(context)?;
+            send_EVENT_CHAT_MODIFIED = true;
         }
     }
 
@@ -1101,7 +1085,7 @@ fn create_or_lookup_group(
             }
         }
         send_EVENT_CHAT_MODIFIED = true;
-        chat::reset_gossiped_timestamp(context, chat_id);
+        chat::reset_gossiped_timestamp(context, chat_id)?;
     }
 
     if send_EVENT_CHAT_MODIFIED {

src/headerdef.rs

@@ -19,7 +19,9 @@ pub enum HeaderDef {
     ChatGroupName,
     ChatGroupNameChanged,
     ChatVerified,
-    ChatGroupImage,
+    ChatGroupImage, // deprecated
+    ChatGroupAvatar,
+    ChatUserAvatar,
     ChatVoiceMessage,
     ChatGroupMemberRemoved,
     ChatGroupMemberAdded,

src/imap_client.rs

@@ -4,12 +4,11 @@ use async_imap::{
     types::{Capabilities, Fetch, Mailbox, Name},
     Client as ImapClient, Session as ImapSession,
 };
+use async_native_tls::TlsStream;
 use async_std::net::{self, TcpStream};
 use async_std::prelude::*;
-use async_std::sync::Arc;
-use async_tls::client::TlsStream;
 
-use crate::login_param::{dc_build_tls_config, CertificateChecks};
+use crate::login_param::{dc_build_tls, CertificateChecks};
 
 #[derive(Debug)]
 pub(crate) enum Client {
@@ -36,9 +35,9 @@ impl Client {
         certificate_checks: CertificateChecks,
     ) -> ImapResult<Self> {
         let stream = TcpStream::connect(addr).await?;
-        let tls_config = dc_build_tls_config(certificate_checks);
-        let tls_connector: async_tls::TlsConnector = Arc::new(tls_config).into();
-        let tls_stream = tls_connector.connect(domain.as_ref(), stream)?.await?;
+        let tls = dc_build_tls(certificate_checks)?;
+        let tls_connector: async_native_tls::TlsConnector = tls.into();
+        let tls_stream = tls_connector.connect(domain.as_ref(), stream).await?;
         let mut client = ImapClient::new(tls_stream);
         if std::env::var(crate::DCC_IMAP_DEBUG).is_ok() {
             client.debug = true;
@@ -74,10 +73,10 @@ impl Client {
     ) -> ImapResult<Client> {
         match self {
             Client::Insecure(client) => {
-                let tls_config = dc_build_tls_config(certificate_checks);
-                let tls: async_tls::TlsConnector = Arc::new(tls_config).into();
+                let tls = dc_build_tls(certificate_checks)?;
+                let tls_stream = tls.into();
 
-                let client_sec = client.secure(domain, &tls).await?;
+                let client_sec = client.secure(domain, &tls_stream).await?;
 
                 Ok(Client::Secure(client_sec))
             }

src/job.rs

@@ -633,7 +633,15 @@ pub fn job_send_msg(context: &Context, msg_id: MsgId) -> Result<(), Error> {
     /* create message */
     let needs_encryption = msg.param.get_int(Param::GuaranteeE2ee).unwrap_or_default();
 
-    let mimefactory = MimeFactory::from_msg(context, &msg)?;
+    let attach_selfavatar = match chat::shall_attach_selfavatar(context, msg.chat_id) {
+        Ok(attach_selfavatar) => attach_selfavatar,
+        Err(err) => {
+            warn!(context, "job: cannot get selfavatar-state: {}", err);
+            false
+        }
+    };
+
+    let mimefactory = MimeFactory::from_msg(context, &msg, attach_selfavatar)?;
     let mut rendered_msg = mimefactory.render().map_err(|err| {
         message::set_msg_failed(context, msg_id, Some(err.to_string()));
         err
@@ -670,8 +678,9 @@ pub fn job_send_msg(context: &Context, msg_id: MsgId) -> Result<(), Error> {
     }
 
     if rendered_msg.is_gossiped {
-        chat::set_gossiped_timestamp(context, msg.chat_id, time());
+        chat::set_gossiped_timestamp(context, msg.chat_id, time())?;
     }
+
     if 0 != rendered_msg.last_added_location_id {
         if let Err(err) = location::set_kml_sent_timestamp(context, msg.chat_id, time()) {
             error!(context, "Failed to set kml sent_timestamp: {:?}", err);
@@ -684,6 +693,13 @@ pub fn job_send_msg(context: &Context, msg_id: MsgId) -> Result<(), Error> {
             }
         }
     }
+
+    if attach_selfavatar {
+        if let Err(err) = chat::set_selfavatar_timestamp(context, msg.chat_id, time()) {
+            error!(context, "Failed to set selfavatar timestamp: {:?}", err);
+        }
+    }
+
     if rendered_msg.is_encrypted && needs_encryption == 0 {
         msg.param.set_int(Param::GuaranteeE2ee, 1);
         msg.save_param_to_disk(context);

src/lib.rs

@@ -13,6 +13,7 @@
     clippy::match_bool
 )]
 #![feature(ptr_wrapping_offset_from)]
+#![feature(drain_filter)]
 
 #[macro_use]
 extern crate failure_derive;

src/login_param.rs

@@ -4,10 +4,6 @@ use std::borrow::Cow;
 use std::fmt;
 
 use crate::context::Context;
-use async_std::sync::Arc;
-use rustls;
-use webpki;
-use webpki_roots;
 
 #[derive(Copy, Clone, Debug, Display, FromPrimitive)]
 #[repr(i32)]
@@ -262,43 +258,25 @@ fn get_readable_flags(flags: i32) -> String {
     res
 }
 
-pub struct NoCertificateVerification {}
-
-impl rustls::ServerCertVerifier for NoCertificateVerification {
-    fn verify_server_cert(
-        &self,
-        _roots: &rustls::RootCertStore,
-        _presented_certs: &[rustls::Certificate],
-        _dns_name: webpki::DNSNameRef<'_>,
-        _ocsp: &[u8],
-    ) -> Result<rustls::ServerCertVerified, rustls::TLSError> {
-        Ok(rustls::ServerCertVerified::assertion())
-    }
-}
-
-pub fn dc_build_tls_config(certificate_checks: CertificateChecks) -> rustls::ClientConfig {
-    let mut config = rustls::ClientConfig::new();
-    config
-        .root_store
-        .add_server_trust_anchors(&webpki_roots::TLS_SERVER_ROOTS);
-
+pub fn dc_build_tls(
+    certificate_checks: CertificateChecks,
+) -> Result<native_tls::TlsConnector, native_tls::Error> {
+    let mut tls_builder = native_tls::TlsConnector::builder();
     match certificate_checks {
-        CertificateChecks::Strict => {}
         CertificateChecks::Automatic => {
             // Same as AcceptInvalidCertificates for now.
             // TODO: use provider database when it becomes available
-            config
-                .dangerous()
-                .set_certificate_verifier(Arc::new(NoCertificateVerification {}));
+            tls_builder
+                .danger_accept_invalid_hostnames(true)
+                .danger_accept_invalid_certs(true)
         }
+        CertificateChecks::Strict => &mut tls_builder,
         CertificateChecks::AcceptInvalidCertificates
-        | CertificateChecks::AcceptInvalidCertificates2 => {
-            config
-                .dangerous()
-                .set_certificate_verifier(Arc::new(NoCertificateVerification {}));
-        }
+        | CertificateChecks::AcceptInvalidCertificates2 => tls_builder
+            .danger_accept_invalid_hostnames(true)
+            .danger_accept_invalid_certs(true),
     }
-    config
+    .build()
 }
 
 #[cfg(test)]

src/mimefactory.rs

@@ -1,6 +1,7 @@
 use chrono::TimeZone;
 use lettre_email::{mime, Address, Header, MimeMultipartType, PartBuilder};
 
+use crate::blob::BlobObject;
 use crate::chat::{self, Chat};
 use crate::config::Config;
 use crate::constants::*;
@@ -41,6 +42,7 @@ pub struct MimeFactory<'a, 'b> {
     pub req_mdn: bool,
     pub context: &'a Context,
     last_added_location_id: u32,
+    attach_selfavatar: bool,
 }
 
 /// Result of rendering a message, ready to be submitted to a send job.
@@ -62,7 +64,11 @@ pub struct RenderedEmail {
 }
 
 impl<'a, 'b> MimeFactory<'a, 'b> {
-    pub fn from_msg(context: &'a Context, msg: &'b Message) -> Result<MimeFactory<'a, 'b>, Error> {
+    pub fn from_msg(
+        context: &'a Context,
+        msg: &'b Message,
+        add_selfavatar: bool,
+    ) -> Result<MimeFactory<'a, 'b>, Error> {
         let chat = Chat::load_from_db(context, msg.chat_id)?;
 
         let mut factory = MimeFactory {
@@ -84,6 +90,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
             references: String::default(),
             req_mdn: false,
             last_added_location_id: 0,
+            attach_selfavatar: add_selfavatar,
             context,
         };
 
@@ -152,7 +159,10 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
                 let in_reply_to: String = row.get(0)?;
                 let references: String = row.get(1)?;
 
-                Ok((in_reply_to, references))
+                Ok((
+                    render_rfc724_mid_list(&in_reply_to),
+                    render_rfc724_mid_list(&references),
+                ))
             },
         );
 
@@ -207,6 +217,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
             references: String::default(),
             req_mdn: false,
             last_added_location_id: 0,
+            attach_selfavatar: false,
         })
     }
 
@@ -293,9 +304,8 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
             Loaded::Message => {
                 let chat = self.chat.as_ref().unwrap();
                 // beside key- and member-changes, force re-gossip every 48 hours
-                if chat.gossiped_timestamp == 0
-                    || (chat.gossiped_timestamp + (2 * 24 * 60 * 60)) > time()
-                {
+                let gossiped_timestamp = chat.get_gossiped_timestamp(self.context);
+                if gossiped_timestamp == 0 || (gossiped_timestamp + (2 * 24 * 60 * 60)) > time() {
                     return true;
                 }
 
@@ -321,6 +331,15 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
                     _ => {}
                 }
 
+                if self
+                    .msg
+                    .param
+                    .get_bool(Param::AttachGroupImage)
+                    .unwrap_or_default()
+                {
+                    return chat.param.get(Param::ProfileImage).map(Into::into);
+                }
+
                 None
             }
             Loaded::MDN => None,
@@ -443,7 +462,6 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
         }
 
         let min_verified = self.min_verified();
-        let do_gossip = self.should_do_gossip();
         let grpimage = self.grpimage();
         let force_plaintext = self.should_force_plaintext();
         let subject_str = self.subject_str();
@@ -477,19 +495,31 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
             Loaded::MDN => dc_create_outgoing_rfc724_mid(None, &self.from_addr),
         };
 
-        protected_headers.push(Header::new("Message-ID".into(), rfc724_mid.clone()));
+        // we could also store the message-id in the protected headers
+        // which would probably help to survive providers like
+        // Outlook.com or hotmail which mangle the Message-ID.
+        // but they also strip the Autocrypt header so we probably
+        // never get a chance to tunnel our protected headers in a
+        // cryptographic payload.
+        unprotected_headers.push(Header::new(
+            "Message-ID".into(),
+            render_rfc724_mid(&rfc724_mid),
+        ));
 
         unprotected_headers.push(Header::new_with_value("To".into(), to).unwrap());
         unprotected_headers.push(Header::new_with_value("From".into(), vec![from]).unwrap());
 
+        let mut is_gossiped = false;
+
         let outer_message = if is_encrypted {
-            // Add gossip headers
-            if do_gossip {
+            // Add gossip headers in chats with multiple recipients
+            if peerstates.len() > 1 && self.should_do_gossip() {
                 for peerstate in peerstates.iter().filter_map(|(state, _)| state.as_ref()) {
                     if peerstate.peek_key(min_verified).is_some() {
                         if let Some(header) = peerstate.render_gossip_header(min_verified) {
                             message =
                                 message.header(Header::new("Autocrypt-Gossip".into(), header));
+                            is_gossiped = true;
                         }
                     }
                 }
@@ -570,8 +600,6 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
             message
         };
 
-        let is_gossiped = is_encrypted && do_gossip && !peerstates.is_empty();
-
         let MimeFactory {
             recipients_addr,
             from_addr,
@@ -608,6 +636,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
         let command = self.msg.param.get_cmd();
         let mut placeholdertext = None;
         let mut meta_part = None;
+        let mut add_compatibility_header = false;
 
         if chat.typ == Chattype::VerifiedGroup {
             protected_headers.push(Header::new("Chat-Verified".to_string(), "1".to_string()));
@@ -648,6 +677,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
                             "vg-member-added".to_string(),
                         ));
                     }
+                    add_compatibility_header = true;
                 }
                 SystemMessage::GroupNameChanged => {
                     let value_to_add = self.msg.param.get(Param::Arg).unwrap_or_default();
@@ -658,10 +688,17 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
                     ));
                 }
                 SystemMessage::GroupImageChanged => {
+                    protected_headers.push(Header::new(
+                        "Chat-Content".to_string(),
+                        "group-avatar-changed".to_string(),
+                    ));
                     if grpimage.is_none() {
-                        protected_headers
-                            .push(Header::new("Chat-Group-Image".to_string(), "0".to_string()));
+                        protected_headers.push(Header::new(
+                            "Chat-Group-Avatar".to_string(),
+                            "0".to_string(),
+                        ));
                     }
+                    add_compatibility_header = true;
                 }
                 _ => {}
             }
@@ -729,7 +766,18 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
 
             let (mail, filename_as_sent) = build_body_file(context, &meta, "group-image")?;
             meta_part = Some(mail);
-            protected_headers.push(Header::new("Chat-Group-Image".into(), filename_as_sent));
+            protected_headers.push(Header::new(
+                "Chat-Group-Avatar".into(),
+                filename_as_sent.clone(),
+            ));
+
+            // add the old group-image headers for versions <=0.973 resp. <=beta.15 (december 2019)
+            // image deletion is not supported in the compatibility layer.
+            // this can be removed some time after releasing 1.0,
+            // grep for #DeprecatedAvatar to get the place where compatibility parsing takes place.
+            if add_compatibility_header {
+                protected_headers.push(Header::new("Chat-Group-Image".into(), filename_as_sent));
+            }
         }
 
         if self.msg.type_0 == Viewtype::Sticker {
@@ -861,6 +909,19 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
             }
         }
 
+        if self.attach_selfavatar {
+            match context.get_config(Config::Selfavatar) {
+                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())),
+            }
+        }
+
         // Single part, render as regular message.
         if parts.len() == 1 {
             return Ok(parts.pop().unwrap());
@@ -1012,6 +1073,31 @@ fn build_body_file(
     Ok((mail, filename_to_send))
 }
 
+fn build_selfavatar_file(context: &Context, path: String) -> Result<(PartBuilder, String), Error> {
+    let blob = BlobObject::from_path(context, path)?;
+    let filename_to_send = match blob.suffix() {
+        Some(suffix) => format!("avatar.{}", suffix),
+        None => "avatar".to_string(),
+    };
+    let mimetype = match message::guess_msgtype_from_suffix(blob.as_rel_path()) {
+        Some(res) => res.1.parse()?,
+        None => mime::APPLICATION_OCTET_STREAM,
+    };
+    let body = std::fs::read(blob.to_abs_path())?;
+    let encoded_body = base64::encode(&body);
+
+    let part = PartBuilder::new()
+        .content_type(&mimetype)
+        .header((
+            "Content-Disposition",
+            format!("attachment; filename=\"{}\"", &filename_to_send),
+        ))
+        .header(("Content-Transfer-Encoding", "base64"))
+        .body(encoded_body);
+
+    Ok((part, filename_to_send))
+}
+
 pub(crate) fn vec_contains_lowercase(vec: &[String], part: &str) -> bool {
     let partlc = part.to_lowercase();
     for cur in vec.iter() {
@@ -1032,6 +1118,25 @@ fn is_file_size_okay(context: &Context, msg: &Message) -> bool {
     }
 }
 
+fn render_rfc724_mid(rfc724_mid: &str) -> String {
+    let rfc724_mid = rfc724_mid.trim().to_string();
+
+    if rfc724_mid.chars().nth(0).unwrap_or_default() == '<' {
+        rfc724_mid
+    } else {
+        format!("<{}>", rfc724_mid)
+    }
+}
+
+fn render_rfc724_mid_list(mid_list: &str) -> String {
+    mid_list
+        .trim()
+        .split_ascii_whitespace()
+        .map(render_rfc724_mid)
+        .collect::<Vec<String>>()
+        .join(" ")
+}
+
 /* ******************************************************************************
  * Encode/decode header words, RFC 2047
  ******************************************************************************/
@@ -1072,4 +1177,30 @@ mod tests {
 
         assert_eq!(s, "=?utf-8?q?=C3=A4_space?= <x@y.org>");
     }
+
+    #[test]
+    fn test_render_rfc724_mid() {
+        assert_eq!(
+            render_rfc724_mid("kqjwle123@qlwe"),
+            "<kqjwle123@qlwe>".to_string()
+        );
+        assert_eq!(
+            render_rfc724_mid("  kqjwle123@qlwe "),
+            "<kqjwle123@qlwe>".to_string()
+        );
+        assert_eq!(
+            render_rfc724_mid("<kqjwle123@qlwe>"),
+            "<kqjwle123@qlwe>".to_string()
+        );
+    }
+
+    #[test]
+    fn test_render_rc724_mid_list() {
+        assert_eq!(render_rfc724_mid_list("123@q "), "<123@q>".to_string());
+        assert_eq!(render_rfc724_mid_list(" 123@q "), "<123@q>".to_string());
+        assert_eq!(
+            render_rfc724_mid_list("123@q 456@d "),
+            "<123@q> <456@d>".to_string()
+        );
+    }
 }

src/mimeparser.rs

@@ -37,11 +37,30 @@ pub struct MimeParser<'a> {
     pub is_system_message: SystemMessage,
     pub location_kml: Option<location::Kml>,
     pub message_kml: Option<location::Kml>,
+    pub user_avatar: AvatarAction,
+    pub group_avatar: AvatarAction,
     reports: Vec<Report>,
     mdns_enabled: bool,
     parsed_protected_headers: bool,
 }
 
+#[derive(Debug, PartialEq)]
+pub enum AvatarAction {
+    None,
+    Delete,
+    Change(String),
+}
+
+impl AvatarAction {
+    pub fn is_change(&self) -> bool {
+        match self {
+            AvatarAction::None => false,
+            AvatarAction::Delete => false,
+            AvatarAction::Change(_) => true,
+        }
+    }
+}
+
 #[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, ToSql, FromSql)]
 #[repr(i32)]
 pub enum SystemMessage {
@@ -83,6 +102,8 @@ impl<'a> MimeParser<'a> {
             is_system_message: SystemMessage::Unknown,
             location_kml: None,
             message_kml: None,
+            user_avatar: AvatarAction::None,
+            group_avatar: AvatarAction::None,
             mdns_enabled,
             parsed_protected_headers: false,
         };
@@ -93,7 +114,8 @@ impl<'a> MimeParser<'a> {
             .and_then(|v| mailparse::dateparse(&v).ok())
             .unwrap_or_default();
 
-        parser.hash_header(&mail.headers);
+        // init known headers with what mailparse provided us
+        parser.merge_headers(&mail.headers);
 
         // Memory location for a possible decrypted message.
         let mail_raw;
@@ -118,6 +140,10 @@ impl<'a> MimeParser<'a> {
                     parser.gossipped_addr =
                         update_gossip_peerstates(context, message_time, &mail, gossip_headers)?;
 
+                    // let known protected headers from the decrypted
+                    // part override the unencrypted top-level
+                    parser.merge_headers(&decrypted_mail.headers);
+
                     decrypted_mail
                 } else {
                     // Message was not encrypted
@@ -146,49 +172,31 @@ impl<'a> MimeParser<'a> {
 
     fn parse_headers(&mut self) -> Result<()> {
         if self.get(HeaderDef::AutocryptSetupMessage).is_some() {
-            let has_setup_file = self.parts.iter().any(|p| {
-                p.mimetype.is_some() && p.mimetype.as_ref().unwrap().as_ref() == MIME_AC_SETUP_FILE
+            self.parts.drain_filter(|part| {
+                part.mimetype.is_some()
+                    && part.mimetype.as_ref().unwrap().as_ref() != MIME_AC_SETUP_FILE
             });
-
-            if has_setup_file {
+            if self.parts.len() == 1 {
                 self.is_system_message = SystemMessage::AutocryptSetupMessage;
-
-                // TODO: replace the following code with this
-                // once drain_filter stabilizes.
-                //
-                // See https://doc.rust-lang.org/std/vec/struct.Vec.html#method.drain_filter
-                // and https://github.com/rust-lang/rust/issues/43244
-                //
-                // mimeparser
-                //    .parts
-                //    .drain_filter(|part| part.int_mimetype != 111)
-                //    .for_each(|part| dc_mimepart_unref(part));
-
-                let mut i = 0;
-                while i != self.parts.len() {
-                    let mimetype = &self.parts[i].mimetype;
-                    if mimetype.is_none()
-                        || mimetype.as_ref().unwrap().as_ref() != MIME_AC_SETUP_FILE
-                    {
-                        self.parts.remove(i);
-                    } else {
-                        i += 1;
-                    }
-                }
+            } else {
+                warn!(self.context, "could not determine ASM mime-part");
             }
         } else if let Some(value) = self.get(HeaderDef::ChatContent) {
             if value == "location-streaming-enabled" {
                 self.is_system_message = SystemMessage::LocationStreamingEnabled;
             }
         }
-        if self.get(HeaderDef::ChatGroupImage).is_some() && !self.parts.is_empty() {
-            let textpart = &self.parts[0];
-            if textpart.typ == Viewtype::Text && self.parts.len() >= 2 {
-                let imgpart = &mut self.parts[1];
-                if imgpart.typ == Viewtype::Image {
-                    imgpart.is_meta = true;
-                }
-            }
+
+        if let Some(header_value) = self.get(HeaderDef::ChatGroupAvatar).cloned() {
+            self.group_avatar = self.avatar_action_from_header(header_value);
+        } else if let Some(header_value) = self.get(HeaderDef::ChatGroupImage).cloned() {
+            // parse the old group-image headers for versions <=0.973 resp. <=beta.15 (december 2019)
+            // grep for #DeprecatedAvatar to get the place where a compatibility header is generated.
+            self.group_avatar = self.avatar_action_from_header(header_value);
+        }
+
+        if let Some(header_value) = self.get(HeaderDef::ChatUserAvatar).cloned() {
+            self.user_avatar = self.avatar_action_from_header(header_value);
         }
 
         if self.has_chat_version() && self.parts.len() == 2 {
@@ -322,6 +330,29 @@ impl<'a> MimeParser<'a> {
         Ok(())
     }
 
+    fn avatar_action_from_header(&mut self, header_value: String) -> AvatarAction {
+        if header_value == "0" {
+            return AvatarAction::Delete;
+        } else {
+            let mut i = 0;
+            while i != self.parts.len() {
+                let part = &mut self.parts[i];
+                if let Some(part_filename) = &part.org_filename {
+                    if part_filename == &header_value {
+                        if let Some(blob) = part.param.get(Param::File) {
+                            let res = AvatarAction::Change(blob.to_string());
+                            self.parts.remove(i);
+                            return res;
+                        }
+                        break;
+                    }
+                }
+                i += 1;
+            }
+        }
+        AvatarAction::None
+    }
+
     pub fn get_last_nonmeta(&self) -> Option<&Part> {
         self.parts.iter().rev().find(|part| !part.is_meta)
     }
@@ -367,12 +398,7 @@ impl<'a> MimeParser<'a> {
                 return Ok(false);
             }
 
-            if self.parsed_protected_headers {
-                warn!(self.context, "Ignoring nested protected headers");
-            } else {
-                self.hash_header(&mail.headers);
-                self.parsed_protected_headers = true;
-            }
+            warn!(self.context, "Ignoring nested protected headers");
         }
 
         enum MimeS {
@@ -525,10 +551,6 @@ impl<'a> MimeParser<'a> {
         let raw_mime = mail.ctype.mimetype.to_lowercase();
 
         let filename = get_attachment_filename(mail);
-        info!(
-            self.context,
-            "add_single_part_if_known {:?} {:?}", mime_type, msg_type
-        );
 
         let old_part_count = self.parts.len();
 
@@ -638,6 +660,7 @@ impl<'a> MimeParser<'a> {
         }
 
         part.typ = msg_type;
+        part.org_filename = Some(filename.to_string());
         part.mimetype = Some(mime_type);
         part.bytes = decoded_data.len();
         part.param.set(Param::File, blob.as_name());
@@ -686,7 +709,7 @@ impl<'a> MimeParser<'a> {
         }
     }
 
-    fn hash_header(&mut self, fields: &[mailparse::MailHeader<'_>]) {
+    fn merge_headers(&mut self, fields: &[mailparse::MailHeader<'_>]) {
         for field in fields {
             if let Ok(key) = field.get_key() {
                 // lowercasing all headers is technically not correct, but makes things work better
@@ -851,6 +874,7 @@ pub struct Part {
     pub msg_raw: Option<String>,
     pub bytes: usize,
     pub param: Params,
+    org_filename: Option<String>,
 }
 
 /// return mimetype and viewtype for a parsed mail
@@ -926,7 +950,6 @@ fn get_attachment_filename(mail: &mailparse::ParsedMail) -> Result<String> {
             acc += value;
             acc
         });
-    println!("get_attachment_filename1: {:?}", desired_filename);
 
     if desired_filename.is_empty() {
         if let Some(param) = ct.params.get("name") {
@@ -934,7 +957,6 @@ fn get_attachment_filename(mail: &mailparse::ParsedMail) -> Result<String> {
             desired_filename = param.to_string();
         }
     }
-    println!("get_attachment_filename2: {:?}", desired_filename);
 
     // if there is still no filename, guess one
     if desired_filename.is_empty() {
@@ -944,7 +966,6 @@ fn get_attachment_filename(mail: &mailparse::ParsedMail) -> Result<String> {
             bail!("could not determine filename: {:?}", ct.disposition);
         }
     }
-    println!("get_attachment_filename3: {:?}", desired_filename);
 
     Ok(desired_filename)
 }
@@ -1110,21 +1131,65 @@ mod tests {
                     --==break==--\n\
                     \n\
                     \x00";
+
         let mimeparser = MimeParser::from_bytes(&context.ctx, &raw[..]).unwrap();
 
-        // test that we treat Subject as a protected header that can
-        // bubble upwards
-        assert_eq!(mimeparser.get_subject(), Some("inner-subject".into()));
-
+        // non-overwritten headers do not bubble up
         let of = mimeparser.get(HeaderDef::SecureJoinGroup).unwrap();
         assert_eq!(of, "no");
 
-        // unprotected headers do not bubble upwards
+        // unknown headers do not bubble upwards
         let of = mimeparser.get(HeaderDef::_TestHeader).unwrap();
         assert_eq!(of, "Bar");
 
+        // the following fields would bubble up
+        // if the test would really use encryption for the protected part
+        // however, as this is not the case, the outer things stay valid
+        assert_eq!(mimeparser.get_subject(), Some("outer-subject".into()));
+
         let of = mimeparser.get(HeaderDef::ChatVersion).unwrap();
-        assert_eq!(of, "1.0");
+        assert_eq!(of, "0.0");
         assert_eq!(mimeparser.parts.len(), 1);
     }
+
+    #[test]
+    fn test_mimeparser_with_avatars() {
+        let t = dummy_context();
+
+        let raw = include_bytes!("../test-data/message/mail_attach_txt.eml");
+        let mimeparser = MimeParser::from_bytes(&t.ctx, &raw[..]).unwrap();
+        assert_eq!(mimeparser.user_avatar, AvatarAction::None);
+        assert_eq!(mimeparser.group_avatar, AvatarAction::None);
+
+        let raw = include_bytes!("../test-data/message/mail_with_user_avatar.eml");
+        let mimeparser = MimeParser::from_bytes(&t.ctx, &raw[..]).unwrap();
+        assert_eq!(mimeparser.parts.len(), 1);
+        assert_eq!(mimeparser.parts[0].typ, Viewtype::Text);
+        assert!(mimeparser.user_avatar.is_change());
+        assert_eq!(mimeparser.group_avatar, AvatarAction::None);
+
+        let raw = include_bytes!("../test-data/message/mail_with_user_avatar_deleted.eml");
+        let mimeparser = MimeParser::from_bytes(&t.ctx, &raw[..]).unwrap();
+        assert_eq!(mimeparser.parts.len(), 1);
+        assert_eq!(mimeparser.parts[0].typ, Viewtype::Text);
+        assert_eq!(mimeparser.user_avatar, AvatarAction::Delete);
+        assert_eq!(mimeparser.group_avatar, AvatarAction::None);
+
+        let raw = include_bytes!("../test-data/message/mail_with_user_and_group_avatars.eml");
+        let mimeparser = MimeParser::from_bytes(&t.ctx, &raw[..]).unwrap();
+        assert_eq!(mimeparser.parts.len(), 1);
+        assert_eq!(mimeparser.parts[0].typ, Viewtype::Text);
+        assert!(mimeparser.user_avatar.is_change());
+        assert!(mimeparser.group_avatar.is_change());
+
+        // if the Chat-User-Avatar header is missing, the avatar become a normal attachment
+        let raw = include_bytes!("../test-data/message/mail_with_user_and_group_avatars.eml");
+        let raw = String::from_utf8_lossy(raw).to_string();
+        let raw = raw.replace("Chat-User-Avatar:", "Xhat-Xser-Xvatar:");
+        let mimeparser = MimeParser::from_bytes(&t.ctx, raw.as_bytes()).unwrap();
+        assert_eq!(mimeparser.parts.len(), 1);
+        assert_eq!(mimeparser.parts[0].typ, Viewtype::Image);
+        assert_eq!(mimeparser.user_avatar, AvatarAction::None);
+        assert!(mimeparser.group_avatar.is_change());
+    }
 }

src/param.rs

@@ -48,6 +48,10 @@ pub enum Param {
     Arg4 = b'H',
     /// For Messages
     Error = b'L',
+
+    /// For Messages
+    AttachGroupImage = b'A',
+
     /// For Messages: space-separated list of messaged IDs of forwarded copies.
     ///
     /// This is used when a [crate::message::Message] is in the
@@ -192,6 +196,11 @@ impl Params {
         self.get(key).and_then(|s| s.parse().ok())
     }
 
+    /// Get the given parameter and parse as `bool`.
+    pub fn get_bool(&self, key: Param) -> Option<bool> {
+        self.get_int(key).map(|v| v != 0)
+    }
+
     /// Get the parameter behind `Param::Cmd` interpreted as `SystemMessage`.
     pub fn get_cmd(&self) -> SystemMessage {
         self.get_int(Param::Cmd)

src/peerstate.rs

@@ -417,7 +417,7 @@ impl<'a> Peerstate<'a> {
                     &self.addr,
                 ],
             )?;
-            reset_gossiped_timestamp(self.context, 0);
+            reset_gossiped_timestamp(self.context, 0)?;
         } else if self.to_save == Some(ToSave::Timestamps) {
             sql::execute(
                 self.context,

src/smtp/mod.rs

@@ -10,7 +10,7 @@ use async_std::task;
 use crate::constants::*;
 use crate::context::Context;
 use crate::events::Event;
-use crate::login_param::{dc_build_tls_config, LoginParam};
+use crate::login_param::{dc_build_tls, LoginParam};
 use crate::oauth2::*;
 
 #[derive(Debug, Fail)]
@@ -29,6 +29,14 @@ pub enum Error {
     ConnectionSetupFailure(#[cause] async_smtp::smtp::error::Error),
     #[fail(display = "SMTP: oauth2 error {:?}", _0)]
     Oauth2Error { address: String },
+    #[fail(display = "TLS error")]
+    Tls(#[cause] native_tls::Error),
+}
+
+impl From<native_tls::Error> for Error {
+    fn from(err: native_tls::Error) -> Error {
+        Error::Tls(err)
+    }
 }
 
 pub type Result<T> = std::result::Result<T, Error>;
@@ -81,7 +89,7 @@ impl Smtp {
         let domain = &lp.send_server;
         let port = lp.send_port as u16;
 
-        let tls_config = dc_build_tls_config(lp.smtp_certificate_checks);
+        let tls_config = dc_build_tls(lp.smtp_certificate_checks)?.into();
         let tls_parameters = ClientTlsParameters::new(domain.to_string(), tls_config);
 
         let (creds, mechanism) = if 0 != lp.server_flags & (DC_LP_AUTH_OAUTH2 as i32) {

src/sql.rs

@@ -7,7 +7,7 @@ use std::time::Duration;
 use rusqlite::{Connection, OpenFlags, Statement, NO_PARAMS};
 use thread_local_object::ThreadLocal;
 
-use crate::chat::update_saved_messages_icon;
+use crate::chat::{update_device_icon, update_saved_messages_icon};
 use crate::constants::ShowEmails;
 use crate::context::Context;
 use crate::dc_tools::*;
@@ -848,7 +848,6 @@ fn open(
             if exists_before_update && sql.get_raw_config_int(context, "bcc_self").is_none() {
                 sql.set_raw_config_int(context, "bcc_self", 1)?;
             }
-            update_icons = true;
             sql.set_raw_config_int(context, "dbversion", 59)?;
         }
         if dbversion < 60 {
@@ -859,6 +858,15 @@ fn open(
             )?;
             sql.set_raw_config_int(context, "dbversion", 60)?;
         }
+        if dbversion < 61 {
+            info!(context, "[migration] v61");
+            sql.execute(
+                "ALTER TABLE contacts ADD COLUMN selfavatar_sent INTEGER DEFAULT 0;",
+                NO_PARAMS,
+            )?;
+            update_icons = true;
+            sql.set_raw_config_int(context, "dbversion", 61)?;
+        }
 
         // (2) updates that require high-level objects
         // (the structure is complete now and all objects are usable)
@@ -884,6 +892,7 @@ fn open(
         }
         if update_icons {
             update_saved_messages_icon(context)?;
+            update_device_icon(context)?;
         }
     }
 

test-data/message/mail_with_user_and_group_avatars.eml

@@ -0,0 +1,55 @@
+Chat-Group-ID: WVnDtF5azch
+Chat-Group-Name: =?utf-8?q?testgr1?=
+Chat-Group-Avatar: group-image.png
+Chat-User-Avatar: avatar.png
+Subject: =?utf-8?q?Chat=3A_testgr1=3A_hi!_?=
+Date: Thu, 12 Dec 2019 17:24:03 +0000
+X-Mailer: Delta Chat Core 1.0.0-beta.15/CLI
+Chat-Version: 1.0
+Message-ID: <Gr.WVnDtF5azch.c6vUZfnnXYx@testrun.org>
+To: <bpetersen@b44t.com>
+From: =?utf-8?q??= <tunis4@testrun.org>
+Content-Type: multipart/mixed; boundary="LV8nfXkpyyn39fsVyoB1b29PKDMeb5"
+
+
+--LV8nfXkpyyn39fsVyoB1b29PKDMeb5
+Content-Type: text/plain; charset=utf-8
+
+hi! 
+
+-- 
+Sent with my Delta Chat Messenger: https://delta.chat
+
+--LV8nfXkpyyn39fsVyoB1b29PKDMeb5
+Content-Type: image/png
+Content-Disposition: attachment; filename="group-image.png"
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAABhGlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT
+1Iw0AYht+mSqVUHCwi4pChOlkQFXHUKhShQqgVWnUwufQPmjQkKS6OgmvBwZ/FqoOLs64OroIg+APi
+4uqk6CIlfpcUWsR4x3EP733vy913gNCoMM3qGgc03TbTyYSYza2KoVdEEMYATUFmljEnSSn4jq97BP
+h+F+dZ/nV/jl41bzEgIBLPMsO0iTeIpzdtg/M+cZSVZJX4nHjMpAsSP3Jd8fiNc9FlgWdGzUx6njhK
+LBY7WOlgVjI14inimKrplC9kPVY5b3HWKjXWuid/YSSvryxzndYwkljEEiSIUFBDGRXYiNOuk2IhTe
+cJH/+Q65fIpZCrDEaOBVShQXb94H/wu7dWYXLCS4okgO4Xx/kYAUK7QLPuON/HjtM8AYLPwJXe9lcb
+wMwn6fW2FjsC+raBi+u2puwBlzvA4JMhm7IrBWkJhQLwfkbflAP6b4Hwmte31jlOH4AM9Sp1AxwcAq
+NFyl73eXdPZ9/+rWn17wcR7HKATfSiTAAAAAlwSFlzAAAuIwAALiMBeKU/dgAAAAd0SU1FB+MMChYX
+Fh+1IOwAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAGElEQVQoz2P858hAEm
+BiYBjVMKphuGoAAAO8AV+n297RAAAAAElFTkSuQmCC
+
+--LV8nfXkpyyn39fsVyoB1b29PKDMeb5
+Content-Type: image/png
+Content-Disposition: attachment; filename="avatar.png"
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAABhGlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT
+1Iw0AcxV9TpUUqIhYRcchQnSyIFXHUKhShQqgVWnUwufQLmjQkKS6OgmvBwY/FqoOLs64OroIg+AHi
+4uqk6CIl/q8ptIjx4Lgf7+497t4BQr3MNKtrAtB020wl4mImuyoGXhFCEIOIoV9mljEnSUl4jq97+P
+h6F+VZ3uf+HL1qzmKATySeZYZpE28QT2/aBud94jAryirxOfG4SRckfuS64vIb50KTBZ4ZNtOpeeIw
+sVjoYKWDWdHUiKeII6qmU76QcVnlvMVZK1dZ6578haGcvrLMdZojSGARS5AgQkEVJZRhI0qrToqFFO
+3HPfzDTb9ELoVcJTByLKACDXLTD/4Hv7u18rFJNykUB7pfHOdjFAjsAo2a43wfO07jBPA/A1d621+p
+AzOfpNfaWuQI6NsGLq7bmrIHXO4AQ0+GbMpNyU9TyOeB9zP6piwwcAv0rLm9tfZx+gCkqavkDXBwCI
+wVKHvd493Bzt7+PdPq7wd6nHKqMKZUTAAAAANQTFRF/sYAhYATyAAAAAlwSFlzAAAuIwAALiMBeKU/
+dgAAAAd0SU1FB+MMCBY0D29+N8YAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAA
+AADElEQVQI12NgIA0AAAAwAAHHqoWOAAAAAElFTkSuQmCC
+
+--LV8nfXkpyyn39fsVyoB1b29PKDMeb5--

test-data/message/mail_with_user_avatar.eml

@@ -0,0 +1,37 @@
+Chat-User-Avatar: avatar.png
+Subject: =?utf-8?q?Chat=3A_this_is_a_message_with_a_=2E=2E=2E?=
+Message-ID: Mr.wOBwZNbBTVt.NZpmQDwWoNk@example.org
+In-Reply-To: Mr.ETXqza5-WpB.zDEYOLECxAw@example.org
+Date: Sun, 08 Dec 2019 23:12:55 +0000
+X-Mailer: Delta Chat Core 1.0.0-beta.12/CLI
+Chat-Version: 1.0
+To: <tunis3@example.org>
+From: "=?utf-8?q??=" <tunis4@example.org>
+Content-Type: multipart/mixed; boundary="luTiGu6GBoVLCvTkzVtmZmwsmhkNMw"
+
+
+--luTiGu6GBoVLCvTkzVtmZmwsmhkNMw
+Content-Type: text/plain; charset=utf-8
+
+this is a message with a profile-image attached
+
+-- 
+Sent with my Delta Chat Messenger: https://delta.chat
+
+--luTiGu6GBoVLCvTkzVtmZmwsmhkNMw
+Content-Type: image/png
+Content-Disposition: attachment; filename="avatar.png"
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAABhGlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT
+1Iw0AcxV9TpUUqIhYRcchQnSyIFXHUKhShQqgVWnUwufQLmjQkKS6OgmvBwY/FqoOLs64OroIg+AHi
+4uqk6CIl/q8ptIjx4Lgf7+497t4BQr3MNKtrAtB020wl4mImuyoGXhFCEIOIoV9mljEnSUl4jq97+P
+h6F+VZ3uf+HL1qzmKATySeZYZpE28QT2/aBud94jAryirxOfG4SRckfuS64vIb50KTBZ4ZNtOpeeIw
+sVjoYKWDWdHUiKeII6qmU76QcVnlvMVZK1dZ6578haGcvrLMdZojSGARS5AgQkEVJZRhI0qrToqFFO
+3HPfzDTb9ELoVcJTByLKACDXLTD/4Hv7u18rFJNykUB7pfHOdjFAjsAo2a43wfO07jBPA/A1d621+p
+AzOfpNfaWuQI6NsGLq7bmrIHXO4AQ0+GbMpNyU9TyOeB9zP6piwwcAv0rLm9tfZx+gCkqavkDXBwCI
+wVKHvd493Bzt7+PdPq7wd6nHKqMKZUTAAAAANQTFRF/sYAhYATyAAAAAlwSFlzAAAuIwAALiMBeKU/
+dgAAAAd0SU1FB+MMCBY0D29+N8YAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAA
+AADElEQVQI12NgIA0AAAAwAAHHqoWOAAAAAElFTkSuQmCC
+
+--luTiGu6GBoVLCvTkzVtmZmwsmhkNMw--

test-data/message/mail_with_user_avatar_deleted.eml

@@ -0,0 +1,14 @@
+Content-Type: text/plain; charset=utf-8
+Chat-User-Avatar: 0
+Subject: =?utf-8?q?Chat=3A_profile_image_deleted?=
+Message-ID: Mr.tsgoJgn-cBf.0TkFWKJzeSp@example.org
+Date: Sun, 08 Dec 2019 23:28:30 +0000
+X-Mailer: Delta Chat Core 1.0.0-beta.12/CLI
+Chat-Version: 1.0
+To: <tunis3@example>
+From: "=?utf-8?q??=" <tunis4@example.org>
+
+profile image deleted
+
+-- 
+Sent with my Delta Chat Messenger: https://delta.chat