Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-17 05:46:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

docs: update instructions to UI where to display the address

Browse Source
This commit is contained in:
B. Petersen
2025-11-21 14:32:02 +01:00
committed by bjoern
parent f2fb59f0cc
commit 67aac12995
3 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
deltachat-ffi/deltachat.h
View File

@@ -5329,8 +5329,8 @@ int dc_contact_is_key_contact (dc_contact_t* contact);
* *
* - If dc_contact_get_verifier_id() != 0, * - If dc_contact_get_verifier_id() != 0,
* display text "Introduced by ..." * display text "Introduced by ..."
* with the name and address of the contact * with the name of the contact
* formatted by dc_contact_get_name_n_addr(). * formatted by dc_contact_get_name().
* Prefix the text by a green checkmark. * Prefix the text by a green checkmark.
* *
* - If dc_contact_get_verifier_id() == 0 and dc_contact_is_verified() != 0, * - If dc_contact_get_verifier_id() == 0 and dc_contact_is_verified() != 0,
@@ -7377,8 +7377,7 @@ void dc_event_unref(dc_event_t* event);
/// May be followed by the info-messages /// May be followed by the info-messages
/// #DC_STR_SECURE_JOIN_REPLIES, #DC_STR_CONTACT_VERIFIED and #DC_STR_MSGADDMEMBER. /// #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, /// `%1$s` and `%2$s` will be replaced by name of the inviter.
/// `%2$s` will be replaced by the name of the inviter.
#define DC_STR_SECURE_JOIN_STARTED 117 #define DC_STR_SECURE_JOIN_STARTED 117
/// "%1$s replied, waiting for being added to the group…" /// "%1$s replied, waiting for being added to the group…"
@@ -7395,7 +7394,7 @@ void dc_event_unref(dc_event_t* event);
/// ///
/// Subtitle for verification qrcode svg image generated by the core. /// 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 #define DC_STR_SETUP_CONTACT_QR_DESC 119
/// "Scan to join %1$s" /// "Scan to join %1$s"
@@ -7426,7 +7425,7 @@ void dc_event_unref(dc_event_t* event);
/// ///
/// `%1$s` will be replaced by the old group name. /// `%1$s` will be replaced by the old group name.
/// `%2$s` will be replaced by the new 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 #define DC_STR_GROUP_NAME_CHANGED_BY_OTHER 125
/// "You changed the group image." /// "You changed the group image."
@@ -7434,7 +7433,7 @@ void dc_event_unref(dc_event_t* event);
/// "Group image changed by %1$s." /// "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 #define DC_STR_GROUP_IMAGE_CHANGED_BY_OTHER 127
/// "You added member %1$s." /// "You added member %1$s."
@@ -7446,23 +7445,23 @@ void dc_event_unref(dc_event_t* event);
/// "Member %1$s added by %2$s." /// "Member %1$s added by %2$s."
/// ///
/// `%1$s` will be replaced by name and address of the contact added to the group. /// `%1$s` will be replaced by name of the contact added to the group.
/// `%2$s` will be replaced by name and address of the contact who did the action. /// `%2$s` will be replaced by name of the contact who did the action.
/// ///
/// Used in status messages. /// Used in status messages.
#define DC_STR_ADD_MEMBER_BY_OTHER 129 #define DC_STR_ADD_MEMBER_BY_OTHER 129
/// "You removed member %1$s." /// "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. /// Used in status messages.
#define DC_STR_REMOVE_MEMBER_BY_YOU 130 #define DC_STR_REMOVE_MEMBER_BY_YOU 130
/// "Member %1$s removed by %2$s." /// "Member %1$s removed by %2$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.
/// `%2$s` will be replaced by name and address of the contact who did the action. /// `%2$s` will be replaced by name of the contact who did the action.
/// ///
/// Used in status messages. /// Used in status messages.
#define DC_STR_REMOVE_MEMBER_BY_OTHER 131 #define DC_STR_REMOVE_MEMBER_BY_OTHER 131
@@ -7474,7 +7473,7 @@ void dc_event_unref(dc_event_t* event);
/// "Group left by %1$s." /// "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. /// Used in status messages.
#define DC_STR_GROUP_LEFT_BY_OTHER 133 #define DC_STR_GROUP_LEFT_BY_OTHER 133
@@ -7486,7 +7485,7 @@ void dc_event_unref(dc_event_t* event);
/// "Group image deleted by %1$s." /// "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. /// Used in status messages.
#define DC_STR_GROUP_IMAGE_DELETED_BY_OTHER 135 #define DC_STR_GROUP_IMAGE_DELETED_BY_OTHER 135
@@ -7498,7 +7497,7 @@ void dc_event_unref(dc_event_t* event);
/// "Location streaming enabled by %1$s." /// "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. /// Used in status messages.
#define DC_STR_LOCATION_ENABLED_BY_OTHER 137 #define DC_STR_LOCATION_ENABLED_BY_OTHER 137
@@ -7510,7 +7509,7 @@ void dc_event_unref(dc_event_t* event);
/// "Message deletion timer is disabled by %1$s." /// "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. /// Used in status messages.
#define DC_STR_EPHEMERAL_TIMER_DISABLED_BY_OTHER 139 #define DC_STR_EPHEMERAL_TIMER_DISABLED_BY_OTHER 139
@@ -7525,7 +7524,7 @@ void dc_event_unref(dc_event_t* event);
/// "Message deletion timer is set to %1$s s by %2$s." /// "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. /// `%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. /// Used in status messages.
#define DC_STR_EPHEMERAL_TIMER_SECONDS_BY_OTHER 141 #define DC_STR_EPHEMERAL_TIMER_SECONDS_BY_OTHER 141
@@ -7537,7 +7536,7 @@ void dc_event_unref(dc_event_t* event);
/// "Message deletion timer is set to 1 minute by %1$s." /// "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 /// @deprecated 2025-11-14, this string is no longer needed
#define DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_OTHER 143 #define DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_OTHER 143
@@ -7548,7 +7547,7 @@ void dc_event_unref(dc_event_t* event);
/// "Message deletion timer is set to 1 hour by %1$s." /// "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. /// Used in status messages.
#define DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_OTHER 145 #define DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_OTHER 145
@@ -7560,7 +7559,7 @@ void dc_event_unref(dc_event_t* event);
/// "Message deletion timer is set to 1 day by %1$s." /// "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. /// Used in status messages.
#define DC_STR_EPHEMERAL_TIMER_1_DAY_BY_OTHER 147 #define DC_STR_EPHEMERAL_TIMER_1_DAY_BY_OTHER 147
@@ -7572,7 +7571,7 @@ void dc_event_unref(dc_event_t* event);
/// "Message deletion timer is set to 1 week by %1$s." /// "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. /// Used in status messages.
#define DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_OTHER 149 #define DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_OTHER 149
@@ -7589,7 +7588,7 @@ void dc_event_unref(dc_event_t* event);
/// Used in status messages. /// Used in status messages.
/// ///
/// `%1$s` will be replaced by the number of minutes (always >1) the timer is set to. /// `%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 #define DC_STR_EPHEMERAL_TIMER_MINUTES_BY_OTHER 151
/// "You set message deletion timer to %1$s hours." /// "You set message deletion timer to %1$s hours."
@@ -7604,7 +7603,7 @@ void dc_event_unref(dc_event_t* event);
/// Used in status messages. /// Used in status messages.
/// ///
/// `%1$s` will be replaced by the number of hours (always >1) the timer is set to. /// `%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 #define DC_STR_EPHEMERAL_TIMER_HOURS_BY_OTHER 153
/// "You set message deletion timer to %1$s days." /// "You set message deletion timer to %1$s days."
@@ -7619,7 +7618,7 @@ void dc_event_unref(dc_event_t* event);
/// Used in status messages. /// Used in status messages.
/// ///
/// `%1$s` will be replaced by the number of days (always >1) the timer is set to. /// `%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 #define DC_STR_EPHEMERAL_TIMER_DAYS_BY_OTHER 155
/// "You set message deletion timer to %1$s weeks." /// "You set message deletion timer to %1$s weeks."
@@ -7634,7 +7633,7 @@ void dc_event_unref(dc_event_t* event);
/// Used in status messages. /// Used in status messages.
/// ///
/// `%1$s` will be replaced by the number of weeks (always >1) the timer is set to. /// `%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 #define DC_STR_EPHEMERAL_TIMER_WEEKS_BY_OTHER 157
/// "You set message deletion timer to 1 year." /// "You set message deletion timer to 1 year."
@@ -7644,14 +7643,14 @@ void dc_event_unref(dc_event_t* event);
/// "Message deletion timer is set to 1 year by %1$s." /// "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. /// Used in status messages.
#define DC_STR_EPHEMERAL_TIMER_1_YEAR_BY_OTHER 159 #define DC_STR_EPHEMERAL_TIMER_1_YEAR_BY_OTHER 159
/// "Scan to set up second device for %1$s" /// "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 #define DC_STR_BACKUP_TRANSFER_QR 162
/// "Account transferred to your second device." /// "Account transferred to your second device."

3
deltachat-jsonrpc/src/api/types/contact.rs
View File

@@ -47,8 +47,7 @@ pub struct ContactObject {
/// ///
/// - If `verifierId` != 0, /// - If `verifierId` != 0,
/// display text "Introduced by ..." /// display text "Introduced by ..."
/// with the name and address of the contact /// with the name of the contact.
/// formatted by `name_and_addr`/`nameAndAddr`.
/// Prefix the text by a green checkmark. /// Prefix the text by a green checkmark.
/// ///
/// - If `verifierId` == 0 and `isVerified` != 0, /// - If `verifierId` == 0 and `isVerified` != 0,

3
src/contact.rs
View File

@@ -1658,8 +1658,7 @@ WHERE addr=?
/// ///
/// If this returns Some(_), /// If this returns Some(_),
/// display green checkmark in the profile and "Introduced by ..." line /// display green checkmark in the profile and "Introduced by ..." line
/// with the name and address of the contact /// with the name of the contact.
/// formatted by [Self::get_name_n_addr].
/// ///
/// If this returns `Some(None)`, then the contact is verified, /// If this returns `Some(None)`, then the contact is verified,
/// but it's unclear by whom. /// but it's unclear by whom.