add addr to contactinfo in repl

and jsonrpc: `Contact.name_and_addr`)

deltachat-contact-tools/src/lib.rs

@@ -104,14 +104,7 @@ pub fn sanitize_name_and_addr(name: &str, addr: &str) -> (String, String) {
     } else {
         (name, addr.to_string())
     };
-    let mut name = sanitize_name(name);
-
-    // If the 'display name' is just the address, remove it:
-    // Otherwise, the contact would sometimes be shown as "alice@example.com (alice@example.com)" (see `get_name_n_addr()`).
-    // If the display name is empty, DC will just show the address when it needs a display name.
-    if name == addr {
-        name = "".to_string();
-    }
+    let name = sanitize_name(name);
 
     (name, addr)
 }

deltachat-ffi/deltachat.h

@@ -5115,7 +5115,6 @@ void            dc_msg_force_plaintext        (dc_msg_t* msg);
  * By default, these names are equal,
  * but functions working with contact names
  * (e.g. dc_contact_get_name(), dc_contact_get_display_name(),
- * dc_contact_get_name_n_addr(),
  * dc_create_contact() or dc_add_address_book())
  * only affect the given-name.
  */
@@ -5165,7 +5164,7 @@ char*           dc_contact_get_addr          (const dc_contact_t* contact);
  * The function does not return the contact name as received from the network.
  *
  * This name is typically used in a form where the user can edit the name of a contact.
- * To get a fine name to display in lists etc., use dc_contact_get_display_name() or dc_contact_get_name_n_addr().
+ * To get a fine name to display in lists etc., use dc_contact_get_display_name().
  *
  * @memberof dc_contact_t
  * @param contact The contact object.
@@ -5220,23 +5219,6 @@ char*           dc_contact_get_display_name  (const dc_contact_t* contact);
 #define         dc_contact_get_first_name    dc_contact_get_display_name
 
 
-/**
- * Get a summary of name and address.
- *
- * The returned string is either "Name (email@domain.com)" or just
- * "email@domain.com" if the name is unset.
- *
- * The summary is typically used when asking the user something about the contact.
- * The attached e-mail address makes the question unique, e.g. "Chat with Alan Miller (am@uniquedomain.com)?"
- *
- * @memberof dc_contact_t
- * @param contact The contact object.
- * @return A summary string, must be released using dc_str_unref().
- *     Never returns NULL.
- */
-char*           dc_contact_get_name_n_addr   (const dc_contact_t* contact);
-
-
 /**
  * Get the contact's profile image.
  * This is the image set by each remote user on their own

deltachat-ffi/src/lib.rs

@@ -4202,18 +4202,6 @@ pub unsafe extern "C" fn dc_contact_get_display_name(
     ffi_contact.contact.get_display_name().strdup()
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_contact_get_name_n_addr(
-    contact: *mut dc_contact_t,
-) -> *mut libc::c_char {
-    if contact.is_null() {
-        eprintln!("ignoring careless call to dc_contact_get_name_n_addr()");
-        return "".strdup();
-    }
-    let ffi_contact = &*contact;
-    ffi_contact.contact.get_name_n_addr().strdup()
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_contact_get_profile_image(
     contact: *mut dc_contact_t,

deltachat-jsonrpc/src/api/types/contact.rs

@@ -17,7 +17,6 @@ pub struct ContactObject {
     id: u32,
     name: String,
     profile_image: Option<String>, // BLOBS
-    name_and_addr: String,
     is_blocked: bool,
 
     /// Is the contact a key contact.
@@ -96,7 +95,6 @@ impl ContactObject {
             id: contact.id.to_u32(),
             name: contact.get_name().to_owned(),
             profile_image, //BLOBS
-            name_and_addr: contact.get_name_n_addr(),
             is_blocked: contact.is_blocked(),
             is_key_contact: contact.is_key_contact(),
             e2ee_avail: contact.e2ee_avail(context).await?,

deltachat-repl/src/cmdline.rs

@@ -1158,15 +1158,17 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
 
             let contact_id = ContactId::new(arg1.parse()?);
             let contact = Contact::get_by_id(&context, contact_id).await?;
-            let name_n_addr = contact.get_name_n_addr();
+            let display_name = contact.get_display_name();
+            let addr = contact.get_addr();
 
             let mut res = format!(
-                "Contact info for: {}:\nIcon: {}\n",
-                name_n_addr,
+                "Contact info for: {}:\nIcon: {}\nAddr: {}\n",
+                display_name,
                 match contact.get_profile_image(&context).await? {
                     Some(image) => image.to_str().unwrap().to_string(),
                     None => "NoIcon".to_string(),
-                }
+                },
+                addr
             );
 
             res += &Contact::get_encrinfo(&context, contact_id).await?;

src/contact.rs

@@ -434,7 +434,7 @@ pub struct Contact {
     pub id: ContactId,
 
     /// Contact name. It is recommended to use `Contact::get_name`,
-    /// `Contact::get_display_name` or `Contact::get_name_n_addr` to access this field.
+    /// `Contact::get_display_name` to access this field.
     /// May be empty, initially set to `authname`.
     name: String,
 
@@ -1524,7 +1524,7 @@ WHERE addr=?
     /// May be an empty string.
     ///
     /// This name is typically used in a form where the user can edit the name of a contact.
-    /// To get a fine name to display in lists etc., use `Contact::get_display_name` or `Contact::get_name_n_addr`.
+    /// To get a fine name to display in lists etc., use `Contact::get_display_name`.
     pub fn get_name(&self) -> &str {
         &self.name
     }
@@ -1544,26 +1544,6 @@ WHERE addr=?
         &self.addr
     }
 
-    /// Get a summary of name and address.
-    ///
-    /// The returned string is either "Name (email@domain.com)" or just
-    /// "email@domain.com" if the name is unset.
-    ///
-    /// The result should only be used locally and never sent over the network
-    /// as it leaks the local contact name.
-    ///
-    /// The summary is typically used when asking the user something about the contact.
-    /// The attached email address makes the question unique, eg. "Chat with Alan Miller (am@uniquedomain.com)?"
-    pub fn get_name_n_addr(&self) -> String {
-        if !self.name.is_empty() {
-            format!("{} ({})", self.name, self.addr)
-        } else if !self.authname.is_empty() {
-            format!("{} ({})", self.authname, self.addr)
-        } else {
-            (&self.addr).into()
-        }
-    }
-
     /// Get the contact's profile image.
     /// This is the image set by each remote user on their own
     /// using set_config(context, "selfavatar", image).

src/contact/contact_tests.rs

@@ -192,7 +192,6 @@ async fn test_add_or_lookup() {
     assert_eq!(contact.get_authname(), "bla foo");
     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(
@@ -225,7 +224,6 @@ async fn test_add_or_lookup() {
     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(
@@ -239,7 +237,6 @@ async fn test_add_or_lookup() {
     assert_eq!(contact_id, contact_id_test);
     assert_eq!(sth_modified, Modifier::Modified);
     let contact = Contact::get_by_id(&t, contact_id).await.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)
@@ -255,7 +252,6 @@ async fn test_add_or_lookup() {
     assert_eq!(sth_modified, Modifier::Modified);
     let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
     assert_eq!(contact.get_authname(), "m. serious");
-    assert_eq!(contact.get_name_n_addr(), "schnucki (three@drei.sam)");
     assert!(!contact.is_blocked());
 
     // Fourth contact:
@@ -273,7 +269,6 @@ async fn test_add_or_lookup() {
     assert_eq!(contact.get_name(), "Wonderland, Alice");
     assert_eq!(contact.get_display_name(), "Wonderland, Alice");
     assert_eq!(contact.get_addr(), "alice@w.de");
-    assert_eq!(contact.get_name_n_addr(), "Wonderland, Alice (alice@w.de)");
 
     // check SELF
     let contact = Contact::get_by_id(&t, ContactId::SELF).await.unwrap();
@@ -311,7 +306,6 @@ async fn test_contact_name_changes() -> Result<()> {
     assert_eq!(contact.get_authname(), "");
     assert_eq!(contact.get_name(), "");
     assert_eq!(contact.get_display_name(), "f@example.org");
-    assert_eq!(contact.get_name_n_addr(), "f@example.org");
     let contacts = Contact::get_all(&t, 0, Some("f@example.org")).await?;
     assert_eq!(contacts.len(), 0);
 
@@ -337,7 +331,6 @@ async fn test_contact_name_changes() -> Result<()> {
     assert_eq!(contact.get_authname(), "Flobbyfoo");
     assert_eq!(contact.get_name(), "");
     assert_eq!(contact.get_display_name(), "Flobbyfoo");
-    assert_eq!(contact.get_name_n_addr(), "Flobbyfoo (f@example.org)");
     let contacts = Contact::get_all(&t, 0, Some("f@example.org")).await?;
     assert_eq!(contacts.len(), 0);
     let contacts = Contact::get_all(&t, 0, Some("flobbyfoo")).await?;
@@ -367,7 +360,6 @@ async fn test_contact_name_changes() -> Result<()> {
     assert_eq!(contact.get_authname(), "Foo Flobby");
     assert_eq!(contact.get_name(), "");
     assert_eq!(contact.get_display_name(), "Foo Flobby");
-    assert_eq!(contact.get_name_n_addr(), "Foo Flobby (f@example.org)");
     let contacts = Contact::get_all(&t, 0, Some("f@example.org")).await?;
     assert_eq!(contacts.len(), 0);
     let contacts = Contact::get_all(&t, 0, Some("flobbyfoo")).await?;
@@ -385,7 +377,6 @@ async fn test_contact_name_changes() -> Result<()> {
     assert_eq!(contact.get_authname(), "Foo Flobby");
     assert_eq!(contact.get_name(), "Falk");
     assert_eq!(contact.get_display_name(), "Falk");
-    assert_eq!(contact.get_name_n_addr(), "Falk (f@example.org)");
     let contacts = Contact::get_all(&t, 0, Some("f@example.org")).await?;
     assert_eq!(contacts.len(), 0);
     let contacts = Contact::get_all(&t, 0, Some("falk")).await?;

src/message.rs

@@ -207,10 +207,9 @@ impl MsgId {
         ret += &format!("Sent: {fts}");
 
         let from_contact = Contact::get_by_id(context, msg.from_id).await?;
-        let name = from_contact.get_name_n_addr();
+        let name = from_contact.get_name();
         if let Some(override_sender_name) = msg.get_override_sender_name() {
-            let addr = from_contact.get_addr();
-            ret += &format!(" by ~{override_sender_name} ({addr})");
+            ret += &format!(" by ~{override_sender_name}");
         } else {
             ret += &format!(" by {name}");
         }
@@ -258,7 +257,7 @@ impl MsgId {
 
                 let name = Contact::get_by_id(context, contact_id)
                     .await
-                    .map(|contact| contact.get_name_n_addr())
+                    .map(|contact| contact.get_display_name().to_owned())
                     .unwrap_or_default();
 
                 ret += &format!(" by {name}");