QtC.NET/qtc-net-client
QtC.NET/qtc-net-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

Fix A Bug Where Some Contacts Won't Be Populated Into The Contacts List

Browse Source
This commit is contained in:
Alan Moon 2025-11-27 12:39:21 -08:00
parent fb039c6b87
commit a970fd1b5c
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qtc-net-client-2/Forms/Main.cs
View File

@ -816,15 +816,10 @@ namespace qtc_net_client_2
if (!contactsRes.Success || contactsRes.Data == null) if (!contactsRes.Success || contactsRes.Data == null)
return; return;
var uniqueContacts = contactsRes.Data
.GroupBy(c => c.UserId)
.Select(g => g.First())
.ToList();
if (InvokeRequired) if (InvokeRequired)
Invoke(() => ApplyContacts(uniqueContacts)); Invoke(() => ApplyContacts(contactsRes.Data));
else else
ApplyContacts(uniqueContacts); ApplyContacts(contactsRes.Data);
} }
finally finally
{ {
@ -840,15 +835,14 @@ namespace qtc_net_client_2
e.UserStatus == Contact.ContactStatus.AwaitingApprovalFromSelf); e.UserStatus == Contact.ContactStatus.AwaitingApprovalFromSelf);
Contacts.Clear(); Contacts.Clear();
Contacts.AddRange(newContacts.DistinctBy(c => c.UserId)); Contacts.AddRange(newContacts.DistinctBy(c => c.Id));
// Snapshot to avoid concurrent modification
var contactsSnapshot = Contacts.ToList();
flpContacts.SuspendLayout(); flpContacts.SuspendLayout();
flpContacts.Controls.Clear(); flpContacts.Controls.Clear();
foreach (var contact in contactsSnapshot) var contactsSnap = Contacts.ToList();
foreach (var contact in contactsSnap)
{ {
var ctrl = await BuildContactControl(contact); var ctrl = await BuildContactControl(contact);
if (ctrl != null) if (ctrl != null)