Skip to content

Commit dc2d43a

Browse files
committed
feat: do not post "... verified" messages on QR scan success
We still post "... not verified" on failure.
1 parent e900d50 commit dc2d43a

File tree

3 files changed

+10
-64
lines changed

3 files changed

+10
-64
lines changed

src/securejoin.rs

+9-62
Original file line numberDiff line numberDiff line change
@@ -684,9 +684,6 @@ async fn secure_connection_established(
684684
contact_id: ContactId,
685685
chat_id: ChatId,
686686
) -> Result<()> {
687-
let contact = Contact::get_by_id(context, contact_id).await?;
688-
let msg = stock_str::contact_verified(context, &contact).await;
689-
chat::add_info_msg(context, chat_id, &msg, time()).await?;
690687
if context
691688
.get_config_bool(Config::VerifiedOneOnOneChats)
692689
.await?
@@ -924,25 +921,10 @@ mod tests {
924921
// Check Alice got the verified message in her 1:1 chat.
925922
{
926923
let chat = alice.create_chat(&bob).await;
927-
let msg_ids: Vec<_> = chat::get_chat_msgs(&alice.ctx, chat.get_id())
928-
.await
929-
.unwrap()
930-
.into_iter()
931-
.filter_map(|item| match item {
932-
chat::ChatItem::Message { msg_id } => Some(msg_id),
933-
_ => None,
934-
})
935-
.collect();
936-
assert_eq!(msg_ids.len(), 2);
937-
938-
let msg0 = Message::load_from_db(&alice.ctx, msg_ids[0]).await.unwrap();
939-
assert!(msg0.is_info());
940-
assert!(msg0.get_text().contains("[email protected] verified"));
941-
942-
let msg1 = Message::load_from_db(&alice.ctx, msg_ids[1]).await.unwrap();
943-
assert!(msg1.is_info());
924+
let msg = get_chat_msg(&alice, chat.get_id(), 0, 1).await;
925+
assert!(msg.is_info());
944926
let expected_text = chat_protection_enabled(&alice).await;
945-
assert_eq!(msg1.get_text(), expected_text);
927+
assert_eq!(msg.get_text(), expected_text);
946928
}
947929

948930
// Check Alice sent the right message to Bob.
@@ -978,24 +960,10 @@ mod tests {
978960
// Check Bob got the verified message in his 1:1 chat.
979961
{
980962
let chat = bob.create_chat(&alice).await;
981-
let msg_ids: Vec<_> = chat::get_chat_msgs(&bob.ctx, chat.get_id())
982-
.await
983-
.unwrap()
984-
.into_iter()
985-
.filter_map(|item| match item {
986-
chat::ChatItem::Message { msg_id } => Some(msg_id),
987-
_ => None,
988-
})
989-
.collect();
990-
991-
let msg0 = Message::load_from_db(&bob.ctx, msg_ids[0]).await.unwrap();
992-
assert!(msg0.is_info());
993-
assert!(msg0.get_text().contains("[email protected] verified"));
994-
995-
let msg1 = Message::load_from_db(&bob.ctx, msg_ids[1]).await.unwrap();
996-
assert!(msg1.is_info());
963+
let msg = get_chat_msg(&bob, chat.get_id(), 0, 1).await;
964+
assert!(msg.is_info());
997965
let expected_text = chat_protection_enabled(&bob).await;
998-
assert_eq!(msg1.get_text(), expected_text);
966+
assert_eq!(msg.get_text(), expected_text);
999967
}
1000968

1001969
// Check Bob sent the final message
@@ -1294,11 +1262,11 @@ mod tests {
12941262
);
12951263
// There should be 3 messages in the chat:
12961264
// - The ChatProtectionEnabled message
1297-
// - [email protected] verified
12981265
// - You added member [email protected]
1299-
let msg = get_chat_msg(&alice, alice_chatid, 1, 3).await;
1266+
let msg = get_chat_msg(&alice, alice_chatid, 0, 2).await;
13001267
assert!(msg.is_info());
1301-
assert!(msg.get_text().contains("[email protected] verified"));
1268+
let expected_text = chat_protection_enabled(&alice).await;
1269+
assert_eq!(msg.get_text(), expected_text);
13021270
}
13031271

13041272
// Bob should not yet have Alice verified
@@ -1334,27 +1302,6 @@ mod tests {
13341302
println!("msg {msg_id} text: {text}");
13351303
}
13361304
}
1337-
let mut msg_iter = chat::get_chat_msgs(&bob.ctx, bob_chatid)
1338-
.await
1339-
.unwrap()
1340-
.into_iter();
1341-
loop {
1342-
match msg_iter.next() {
1343-
Some(chat::ChatItem::Message { msg_id }) => {
1344-
let msg = Message::load_from_db(&bob.ctx, msg_id).await.unwrap();
1345-
let text = msg.get_text();
1346-
match text.contains("[email protected] verified") {
1347-
true => {
1348-
assert!(msg.is_info());
1349-
break;
1350-
}
1351-
false => continue,
1352-
}
1353-
}
1354-
Some(_) => continue,
1355-
None => panic!("Verified message not found in Bob's group chat"),
1356-
}
1357-
}
13581305
}
13591306

13601307
let sent = bob.pop_sent_msg().await;

src/securejoin/bob.rs

-2
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,7 @@ impl BobState {
222222
/// This creates an info message in the chat being joined.
223223
async fn notify_peer_verified(&self, context: &Context) -> Result<()> {
224224
let contact = Contact::get_by_id(context, self.invite().contact_id()).await?;
225-
let msg = stock_str::contact_verified(context, &contact).await;
226225
let chat_id = self.joining_chat_id(context).await?;
227-
chat::add_info_msg(context, chat_id, &msg, time()).await?;
228226

229227
if context
230228
.get_config_bool(Config::VerifiedOneOnOneChats)

src/stock_str.rs

+1
Original file line numberDiff line numberDiff line change
@@ -824,6 +824,7 @@ pub(crate) async fn secure_join_group_qr_description(context: &Context, chat: &C
824824
}
825825

826826
/// Stock string: `%1$s verified.`.
827+
#[allow(dead_code)]
827828
pub(crate) async fn contact_verified(context: &Context, contact: &Contact) -> String {
828829
let addr = &contact.get_name_n_addr();
829830
translated(context, StockMessage::ContactVerified)

0 commit comments

Comments
 (0)