@@ -297,18 +297,16 @@ async fn get_to_and_past_contact_ids(
297
297
past_member_fingerprints = & [ ] ;
298
298
}
299
299
300
- let pgp_to_ids = add_or_lookup_key_contacts (
301
- context,
302
- & mime_parser. recipients ,
303
- & mime_parser. gossiped_keys ,
304
- to_member_fingerprints,
305
- Origin :: Hidden ,
306
- )
307
- . await ?;
308
-
309
300
match chat_assignment {
310
301
ChatAssignment :: GroupChat { .. } => {
311
- to_ids = pgp_to_ids;
302
+ to_ids = add_or_lookup_key_contacts (
303
+ context,
304
+ & mime_parser. recipients ,
305
+ & mime_parser. gossiped_keys ,
306
+ to_member_fingerprints,
307
+ Origin :: Hidden ,
308
+ )
309
+ . await ?;
312
310
313
311
if let Some ( chat_id) = chat_id {
314
312
past_ids = lookup_key_contacts_by_address_list (
@@ -336,7 +334,14 @@ async fn get_to_and_past_contact_ids(
336
334
ChatAssignment :: ExistingChat { chat_id, .. } => {
337
335
let chat = Chat :: load_from_db ( context, * chat_id) . await ?;
338
336
if chat. is_encrypted ( context) . await ? {
339
- to_ids = pgp_to_ids;
337
+ to_ids = add_or_lookup_key_contacts (
338
+ context,
339
+ & mime_parser. recipients ,
340
+ & mime_parser. gossiped_keys ,
341
+ to_member_fingerprints,
342
+ Origin :: Hidden ,
343
+ )
344
+ . await ?;
340
345
past_ids = lookup_key_contacts_by_address_list (
341
346
context,
342
347
& mime_parser. past_members ,
@@ -388,6 +393,14 @@ async fn get_to_and_past_contact_ids(
388
393
. await ?;
389
394
}
390
395
ChatAssignment :: OneOneChat => {
396
+ let pgp_to_ids = add_or_lookup_key_contacts (
397
+ context,
398
+ & mime_parser. recipients ,
399
+ & mime_parser. gossiped_keys ,
400
+ to_member_fingerprints,
401
+ Origin :: Hidden ,
402
+ )
403
+ . await ?;
391
404
if pgp_to_ids
392
405
. first ( )
393
406
. is_some_and ( |contact_id| contact_id. is_some ( ) )
0 commit comments