Skip to content

Commit 5289945

Browse files
committed
feat: do not set "unknown sender for this chat" error
1 parent e6ab1e3 commit 5289945

File tree

4 files changed

+3
-15
lines changed

4 files changed

+3
-15
lines changed

deltachat-ffi/deltachat.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7214,6 +7214,8 @@ void dc_event_unref(dc_event_t* event);
72147214
/// "Unknown sender for this chat. See 'info' for more details."
72157215
///
72167216
/// Use as message text if assigning the message to a chat is not totally correct.
7217+
///
7218+
/// @deprecated 2025-08-18
72177219
#define DC_STR_UNKNOWN_SENDER_FOR_CHAT 72
72187220

72197221
/// "Message from %1$s"

src/receive_imf.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1693,12 +1693,6 @@ async fn add_parts(
16931693
let name: &str = from.display_name.as_ref().unwrap_or(&from.addr);
16941694
for part in &mut mime_parser.parts {
16951695
part.param.set(Param::OverrideSenderDisplayname, name);
1696-
1697-
if chat.is_protected() {
1698-
// In protected chat, also mark the message with an error.
1699-
let s = stock_str::unknown_sender_for_chat(context).await;
1700-
part.error = Some(s);
1701-
}
17021696
}
17031697
}
17041698
}

src/securejoin/securejoin_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ async fn test_unknown_sender() -> Result<()> {
634634
// The message from Bob is delivered late, Bob is already removed.
635635
let msg = alice.recv_msg(&sent).await;
636636
assert_eq!(msg.text, "Hi hi!");
637-
assert_eq!(msg.error.unwrap(), "Unknown sender for this chat.");
637+
assert_eq!(msg.get_override_sender_name().unwrap(), "[email protected]");
638638

639639
Ok(())
640640
}

src/stock_str.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@ pub enum StockMessage {
123123
however, of course, if they like, you may point them to 👉 https://get.delta.chat"))]
124124
WelcomeMessage = 71,
125125

126-
#[strum(props(fallback = "Unknown sender for this chat."))]
127-
UnknownSenderForChat = 72,
128-
129126
#[strum(props(fallback = "Message from %1$s"))]
130127
SubjectForNewContact = 73,
131128

@@ -909,11 +906,6 @@ pub(crate) async fn welcome_message(context: &Context) -> String {
909906
translated(context, StockMessage::WelcomeMessage).await
910907
}
911908

912-
/// Stock string: `Unknown sender for this chat.`.
913-
pub(crate) async fn unknown_sender_for_chat(context: &Context) -> String {
914-
translated(context, StockMessage::UnknownSenderForChat).await
915-
}
916-
917909
/// Stock string: `Message from %1$s`.
918910
// TODO: This can compute `self_name` itself instead of asking the caller to do this.
919911
pub(crate) async fn subject_for_new_contact(context: &Context, self_name: &str) -> String {

0 commit comments

Comments
 (0)