Skip to content

Commit e05514f

Browse files
committed
Only show Signal contacts
1 parent 6fdcafa commit e05514f

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

Signal-Windows/ViewModels/AddContactPageViewModel.cs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@
2020
using System.Linq;
2121
using Windows.UI.Xaml.Controls;
2222
using System.Globalization;
23+
using System.Threading;
2324

2425
namespace Signal_Windows.ViewModels
2526
{
2627
public class AddContactPageViewModel : ViewModelBase
2728
{
2829
public ObservableCollection<PhoneContact> Contacts;
2930
private List<PhoneContact> signalContacts;
30-
private List<PhoneContact> otherContacts;
3131
private PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil.GetInstance();
32+
private CancellationToken cancellationToken;
3233

3334
private string _ContactName = "";
3435
public string ContactName
@@ -48,10 +49,9 @@ public AddContactPageViewModel()
4849
{
4950
Contacts = new ObservableCollection<PhoneContact>();
5051
signalContacts = new List<PhoneContact>();
51-
otherContacts = new List<PhoneContact>();
5252
}
5353

54-
public async Task OnNavigatedTo()
54+
public async Task OnNavigatedTo(CancellationToken? cancellationToken = null)
5555
{
5656
SignalServiceAccountManager accountManager = new SignalServiceAccountManager(App.ServiceUrls, App.Store.Username, App.Store.Password, (int)App.Store.DeviceId, App.USER_AGENT);
5757
ContactStore contactStore = await ContactManager.RequestStoreAsync(ContactStoreAccessType.AllContactsReadOnly);
@@ -110,13 +110,8 @@ public async Task OnNavigatedTo()
110110
contact.OnSignal = true;
111111
signalContacts.Add(contact);
112112
}
113-
else
114-
{
115-
otherContacts.Add(contact);
116-
}
117113
}
118114
Contacts.AddRange(signalContacts);
119-
Contacts.AddRange(otherContacts);
120115
}
121116
else
122117
{
@@ -183,7 +178,6 @@ internal void searchBox_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextCha
183178
{
184179
string text = sender.Text;
185180
var validContacts = GetContactsMatchingText(text, signalContacts).ToList();
186-
validContacts.AddRange(GetContactsMatchingText(text, otherContacts));
187181
Contacts.Clear();
188182
Contacts.AddRange(validContacts);
189183
}

0 commit comments

Comments
 (0)