From 49614a6d17cd784aa81858929819cca67d509aac Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 21 Nov 2025 14:32:02 +0100 Subject: [PATCH] docs: update instructions to UI where to display the address --- deltachat-ffi/deltachat.h | 53 +++++++++++----------- deltachat-jsonrpc/src/api/types/contact.rs | 3 +- src/contact.rs | 3 +- 3 files changed, 28 insertions(+), 31 deletions(-) diff --git a/deltachat-ffi/deltachat.h b/deltachat-ffi/deltachat.h index 117cb6ef8e..4a1076e7d5 100644 --- a/deltachat-ffi/deltachat.h +++ b/deltachat-ffi/deltachat.h @@ -5321,8 +5321,8 @@ int dc_contact_is_key_contact (dc_contact_t* contact); * * - If dc_contact_get_verifier_id() != 0, * display text "Introduced by ..." - * with the name and address of the contact - * formatted by dc_contact_get_name_n_addr(). + * with the name of the contact + * formatted by dc_contact_get_name(). * Prefix the text by a green checkmark. * * - If dc_contact_get_verifier_id() == 0 and dc_contact_is_verified() != 0, @@ -7370,8 +7370,7 @@ void dc_event_unref(dc_event_t* event); /// May be followed by the info-messages /// #DC_STR_SECURE_JOIN_REPLIES, #DC_STR_CONTACT_VERIFIED and #DC_STR_MSGADDMEMBER. /// -/// `%1$s` will be replaced by name and address of the inviter, -/// `%2$s` will be replaced by the name of the inviter. +/// `%1$s` and `%2$s` will be replaced by name of the inviter. #define DC_STR_SECURE_JOIN_STARTED 117 /// "%1$s replied, waiting for being added to the group…" @@ -7388,7 +7387,7 @@ void dc_event_unref(dc_event_t* event); /// /// Subtitle for verification qrcode svg image generated by the core. /// -/// `%1$s` will be replaced by name and address of the inviter. +/// `%1$s` will be replaced by name of the inviter. #define DC_STR_SETUP_CONTACT_QR_DESC 119 /// "Scan to join %1$s" @@ -7432,7 +7431,7 @@ void dc_event_unref(dc_event_t* event); /// /// `%1$s` will be replaced by the old group name. /// `%2$s` will be replaced by the new group name. -/// `%3$s` will be replaced by name and address of the contact who did the action. +/// `%3$s` will be replaced by name of the contact who did the action. #define DC_STR_GROUP_NAME_CHANGED_BY_OTHER 125 /// "You changed the group image." @@ -7440,7 +7439,7 @@ void dc_event_unref(dc_event_t* event); /// "Group image changed by %1$s." /// -/// `%1$s` will be replaced by name and address of the contact who did the action. +/// `%1$s` will be replaced by name of the contact who did the action. #define DC_STR_GROUP_IMAGE_CHANGED_BY_OTHER 127 /// "You added member %1$s." @@ -7452,23 +7451,23 @@ void dc_event_unref(dc_event_t* event); /// "Member %1$s added by %2$s." /// -/// `%1$s` will be replaced by name and address of the contact added to the group. -/// `%2$s` will be replaced by name and address of the contact who did the action. +/// `%1$s` will be replaced by name of the contact added to the group. +/// `%2$s` will be replaced by name of the contact who did the action. /// /// Used in status messages. #define DC_STR_ADD_MEMBER_BY_OTHER 129 /// "You removed member %1$s." /// -/// `%1$s` will be replaced by name and address of the contact removed from the group. +/// `%1$s` will be replaced by name of the contact removed from the group. /// /// Used in status messages. #define DC_STR_REMOVE_MEMBER_BY_YOU 130 /// "Member %1$s removed by %2$s." /// -/// `%1$s` will be replaced by name and address of the contact removed from the group. -/// `%2$s` will be replaced by name and address of the contact who did the action. +/// `%1$s` will be replaced by name of the contact removed from the group. +/// `%2$s` will be replaced by name of the contact who did the action. /// /// Used in status messages. #define DC_STR_REMOVE_MEMBER_BY_OTHER 131 @@ -7480,7 +7479,7 @@ void dc_event_unref(dc_event_t* event); /// "Group left by %1$s." /// -/// `%1$s` will be replaced by name and address of the contact. +/// `%1$s` will be replaced by name of the contact. /// /// Used in status messages. #define DC_STR_GROUP_LEFT_BY_OTHER 133 @@ -7492,7 +7491,7 @@ void dc_event_unref(dc_event_t* event); /// "Group image deleted by %1$s." /// -/// `%1$s` will be replaced by name and address of the contact. +/// `%1$s` will be replaced by name of the contact. /// /// Used in status messages. #define DC_STR_GROUP_IMAGE_DELETED_BY_OTHER 135 @@ -7504,7 +7503,7 @@ void dc_event_unref(dc_event_t* event); /// "Location streaming enabled by %1$s." /// -/// `%1$s` will be replaced by name and address of the contact. +/// `%1$s` will be replaced by name of the contact. /// /// Used in status messages. #define DC_STR_LOCATION_ENABLED_BY_OTHER 137 @@ -7516,7 +7515,7 @@ void dc_event_unref(dc_event_t* event); /// "Message deletion timer is disabled by %1$s." /// -/// `%1$s` will be replaced by name and address of the contact. +/// `%1$s` will be replaced by name of the contact. /// /// Used in status messages. #define DC_STR_EPHEMERAL_TIMER_DISABLED_BY_OTHER 139 @@ -7531,7 +7530,7 @@ void dc_event_unref(dc_event_t* event); /// "Message deletion timer is set to %1$s s by %2$s." /// /// `%1$s` will be replaced by the number of seconds (always >1) the timer is set to. -/// `%2$s` will be replaced by name and address of the contact. +/// `%2$s` will be replaced by name of the contact. /// /// Used in status messages. #define DC_STR_EPHEMERAL_TIMER_SECONDS_BY_OTHER 141 @@ -7543,7 +7542,7 @@ void dc_event_unref(dc_event_t* event); /// "Message deletion timer is set to 1 minute by %1$s." /// -/// `%1$s` will be replaced by name and address of the contact. +/// `%1$s` will be replaced by name of the contact. /// @deprecated 2025-11-14, this string is no longer needed #define DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_OTHER 143 @@ -7554,7 +7553,7 @@ void dc_event_unref(dc_event_t* event); /// "Message deletion timer is set to 1 hour by %1$s." /// -/// `%1$s` will be replaced by name and address of the contact. +/// `%1$s` will be replaced by name of the contact. /// /// Used in status messages. #define DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_OTHER 145 @@ -7566,7 +7565,7 @@ void dc_event_unref(dc_event_t* event); /// "Message deletion timer is set to 1 day by %1$s." /// -/// `%1$s` will be replaced by name and address of the contact. +/// `%1$s` will be replaced by name of the contact. /// /// Used in status messages. #define DC_STR_EPHEMERAL_TIMER_1_DAY_BY_OTHER 147 @@ -7578,7 +7577,7 @@ void dc_event_unref(dc_event_t* event); /// "Message deletion timer is set to 1 week by %1$s." /// -/// `%1$s` will be replaced by name and address of the contact. +/// `%1$s` will be replaced by name of the contact. /// /// Used in status messages. #define DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_OTHER 149 @@ -7595,7 +7594,7 @@ void dc_event_unref(dc_event_t* event); /// Used in status messages. /// /// `%1$s` will be replaced by the number of minutes (always >1) the timer is set to. -/// `%2$s` will be replaced by name and address of the contact. +/// `%2$s` will be replaced by name of the contact. #define DC_STR_EPHEMERAL_TIMER_MINUTES_BY_OTHER 151 /// "You set message deletion timer to %1$s hours." @@ -7610,7 +7609,7 @@ void dc_event_unref(dc_event_t* event); /// Used in status messages. /// /// `%1$s` will be replaced by the number of hours (always >1) the timer is set to. -/// `%2$s` will be replaced by name and address of the contact. +/// `%2$s` will be replaced by name of the contact. #define DC_STR_EPHEMERAL_TIMER_HOURS_BY_OTHER 153 /// "You set message deletion timer to %1$s days." @@ -7625,7 +7624,7 @@ void dc_event_unref(dc_event_t* event); /// Used in status messages. /// /// `%1$s` will be replaced by the number of days (always >1) the timer is set to. -/// `%2$s` will be replaced by name and address of the contact. +/// `%2$s` will be replaced by name of the contact. #define DC_STR_EPHEMERAL_TIMER_DAYS_BY_OTHER 155 /// "You set message deletion timer to %1$s weeks." @@ -7640,7 +7639,7 @@ void dc_event_unref(dc_event_t* event); /// Used in status messages. /// /// `%1$s` will be replaced by the number of weeks (always >1) the timer is set to. -/// `%2$s` will be replaced by name and address of the contact. +/// `%2$s` will be replaced by name of the contact. #define DC_STR_EPHEMERAL_TIMER_WEEKS_BY_OTHER 157 /// "You set message deletion timer to 1 year." @@ -7650,14 +7649,14 @@ void dc_event_unref(dc_event_t* event); /// "Message deletion timer is set to 1 year by %1$s." /// -/// `%1$s` will be replaced by name and address of the contact. +/// `%1$s` will be replaced by name of the contact. /// /// Used in status messages. #define DC_STR_EPHEMERAL_TIMER_1_YEAR_BY_OTHER 159 /// "Scan to set up second device for %1$s" /// -/// `%1$s` will be replaced by name and address of the account. +/// `%1$s` will be replaced by name of the account. #define DC_STR_BACKUP_TRANSFER_QR 162 /// "Account transferred to your second device." diff --git a/deltachat-jsonrpc/src/api/types/contact.rs b/deltachat-jsonrpc/src/api/types/contact.rs index bafdfb5cc6..85e42cd118 100644 --- a/deltachat-jsonrpc/src/api/types/contact.rs +++ b/deltachat-jsonrpc/src/api/types/contact.rs @@ -47,8 +47,7 @@ pub struct ContactObject { /// /// - If `verifierId` != 0, /// display text "Introduced by ..." - /// with the name and address of the contact - /// formatted by `name_and_addr`/`nameAndAddr`. + /// with the name of the contact. /// Prefix the text by a green checkmark. /// /// - If `verifierId` == 0 and `isVerified` != 0, diff --git a/src/contact.rs b/src/contact.rs index 6733214710..914d4de599 100644 --- a/src/contact.rs +++ b/src/contact.rs @@ -1635,8 +1635,7 @@ impl Contact { /// /// If this returns Some(_), /// display green checkmark in the profile and "Introduced by ..." line - /// with the name and address of the contact - /// formatted by [Self::get_name_n_addr]. + /// with the name of the contact. /// /// If this returns `Some(None)`, then the contact is verified, /// but it's unclear by whom.