Skip to content

Commit 1dd536d

Browse files
make list conversations synchronise (#1474)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 7f3a583 commit 1dd536d

File tree

1 file changed

+3
-21
lines changed

1 file changed

+3
-21
lines changed

bindings_ffi/src/mls.rs

+3-21
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@ impl FfiConversations {
955955
Ok(num_groups_synced)
956956
}
957957

958-
pub async fn list(
958+
pub fn list(
959959
&self,
960960
opts: FfiListConversationsOptions,
961961
) -> Result<Vec<Arc<FfiConversationListItem>>, GenericError> {
@@ -976,7 +976,7 @@ impl FfiConversations {
976976
Ok(convo_list)
977977
}
978978

979-
pub async fn list_groups(
979+
pub fn list_groups(
980980
&self,
981981
opts: FfiListConversationsOptions,
982982
) -> Result<Vec<Arc<FfiConversationListItem>>, GenericError> {
@@ -999,7 +999,7 @@ impl FfiConversations {
999999
Ok(convo_list)
10001000
}
10011001

1002-
pub async fn list_dms(
1002+
pub fn list_dms(
10031003
&self,
10041004
opts: FfiListConversationsOptions,
10051005
) -> Result<Vec<Arc<FfiConversationListItem>>, GenericError> {
@@ -2727,7 +2727,6 @@ mod tests {
27272727
let bo_groups = bo
27282728
.conversations()
27292729
.list(FfiListConversationsOptions::default())
2730-
.await
27312730
.unwrap();
27322731
let bo_group = &bo_groups[0];
27332732
bo_group.conversation.sync().await.unwrap();
@@ -2811,7 +2810,6 @@ mod tests {
28112810
// Step 4: List conversations and verify
28122811
let conversations = alix_conversations
28132812
.list(FfiListConversationsOptions::default())
2814-
.await
28152813
.unwrap();
28162814

28172815
// Ensure the group is included
@@ -2851,7 +2849,6 @@ mod tests {
28512849
// Step 4: List conversations and verify
28522850
let conversations = alix_conversations
28532851
.list(FfiListConversationsOptions::default())
2854-
.await
28552852
.unwrap();
28562853

28572854
// Ensure the group is included
@@ -2903,7 +2900,6 @@ mod tests {
29032900
// Step 7: Fetch the conversation list
29042901
let conversations = conversations_api
29052902
.list(FfiListConversationsOptions::default())
2906-
.await
29072903
.unwrap();
29082904

29092905
// Step 8: Assert the correct order of conversations
@@ -2969,7 +2965,6 @@ mod tests {
29692965
let alix_groups = alix
29702966
.conversations()
29712967
.list(FfiListConversationsOptions::default())
2972-
.await
29732968
.unwrap();
29742969

29752970
let alix_group1 = alix_groups[0].clone();
@@ -3043,7 +3038,6 @@ mod tests {
30433038
for group in alix
30443039
.conversations()
30453040
.list(FfiListConversationsOptions::default())
3046-
.await
30473041
.unwrap()
30483042
{
30493043
group
@@ -3570,7 +3564,6 @@ mod tests {
35703564
let bo_groups = bo
35713565
.conversations()
35723566
.list(FfiListConversationsOptions::default())
3573-
.await
35743567
.unwrap();
35753568
assert_eq!(bo_groups.len(), 1);
35763569
let bo_group = bo_groups[0].clone();
@@ -3839,7 +3832,6 @@ mod tests {
38393832
// the database.
38403833
let bola_groups = bola_conversations
38413834
.list(FfiListConversationsOptions::default())
3842-
.await
38433835
.unwrap();
38443836

38453837
let bola_group = bola_groups.first().unwrap();
@@ -4023,7 +4015,6 @@ mod tests {
40234015
let _ = bola_conversations.sync().await;
40244016
let bola_groups = bola_conversations
40254017
.list(FfiListConversationsOptions::default())
4026-
.await
40274018
.unwrap();
40284019

40294020
let bola_group = bola_groups.first().unwrap();
@@ -4130,7 +4121,6 @@ mod tests {
41304121
let _ = bola_conversations.sync().await;
41314122
let bola_groups = bola_conversations
41324123
.list(FfiListConversationsOptions::default())
4133-
.await
41344124
.unwrap();
41354125

41364126
let bola_group = bola_groups.first().unwrap();
@@ -4401,37 +4391,31 @@ mod tests {
44014391

44024392
let alix_groups = alix_conversations
44034393
.list_groups(FfiListConversationsOptions::default())
4404-
.await
44054394
.unwrap();
44064395
assert_eq!(alix_groups.len(), 0);
44074396

44084397
let bola_groups = bola_conversations
44094398
.list_groups(FfiListConversationsOptions::default())
4410-
.await
44114399
.unwrap();
44124400
assert_eq!(bola_groups.len(), 0);
44134401

44144402
let alix_dms = alix_conversations
44154403
.list_dms(FfiListConversationsOptions::default())
4416-
.await
44174404
.unwrap();
44184405
assert_eq!(alix_dms.len(), 1);
44194406

44204407
let bola_dms = bola_conversations
44214408
.list_dms(FfiListConversationsOptions::default())
4422-
.await
44234409
.unwrap();
44244410
assert_eq!(bola_dms.len(), 1);
44254411

44264412
let alix_conversations = alix_conversations
44274413
.list(FfiListConversationsOptions::default())
4428-
.await
44294414
.unwrap();
44304415
assert_eq!(alix_conversations.len(), 1);
44314416

44324417
let bola_conversations = bola_conversations
44334418
.list(FfiListConversationsOptions::default())
4434-
.await
44354419
.unwrap();
44364420
assert_eq!(bola_conversations.len(), 1);
44374421
}
@@ -5035,7 +5019,6 @@ mod tests {
50355019
let alix_dm_messages = client_a
50365020
.conversations()
50375021
.list(FfiListConversationsOptions::default())
5038-
.await
50395022
.unwrap()[0]
50405023
.conversation
50415024
.find_messages(FfiListMessagesOptions::default())
@@ -5044,7 +5027,6 @@ mod tests {
50445027
let bo_dm_messages = client_b
50455028
.conversations()
50465029
.list(FfiListConversationsOptions::default())
5047-
.await
50485030
.unwrap()[0]
50495031
.conversation
50505032
.find_messages(FfiListMessagesOptions::default())

0 commit comments

Comments
 (0)