Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed duplicated entry while creating a chat room

Browse source
This commit is contained in:
Sylvain Berfini 2017-10-24 11:27:54 +02:00
parent f89ef35865
commit 1ff455bbae
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/android/org/linphone/contacts/SearchContactsListAdapter.java
View file

@ -114,7 +114,7 @@ public class SearchContactsListAdapter extends BaseAdapter {
} }
public List<ContactAddress> getContactsList() { public List<ContactAddress> getContactsList() {
List<ContactAddress> list = new ArrayList<ContactAddress>(); List<ContactAddress> list = new ArrayList<>();
if (ContactsManager.getInstance().hasContacts()) { if (ContactsManager.getInstance().hasContacts()) {
for (Address addr : LinphoneManager.getLc().findContactsByChar("", mOnlySipContact)) { for (Address addr : LinphoneManager.getLc().findContactsByChar("", mOnlySipContact)) {
LinphoneContact cont = ContactsManager.getInstance().findContactFromAddress(addr); LinphoneContact cont = ContactsManager.getInstance().findContactFromAddress(addr);
@ -163,11 +163,14 @@ public class SearchContactsListAdapter extends BaseAdapter {
} }
List<ContactAddress> result = new ArrayList<>(); List<ContactAddress> result = new ArrayList<>();
String searchAddress = "sip:" + search + "@" + LinphoneManager.getLc().getDefaultProxyConfig().getDomain(); String searchAddress = "sip:" + search + "@" + LinphoneManager.getLc().getDefaultProxyConfig().getDomain();
result.add(new ContactAddress(null, searchAddress, false));
boolean searchFound = false;
if (search != null) { if (search != null) {
for (ContactAddress c : (search.length() < oldSize) ? getContactsList() : getContacts()) { for (ContactAddress c : (search.length() < oldSize) ? getContactsList() : getContacts()) {
String address = c.getAddress(); String address = c.getAddress();
if (address.equals(searchAddress)) searchFound = true;
if (address.startsWith("sip:")) address = address.substring(4); if (address.startsWith("sip:")) address = address.substring(4);
if (c.getContact() != null && c.getContact().getFullName() != null if (c.getContact() != null && c.getContact().getFullName() != null
&& c.getContact().getFullName().toLowerCase(Locale.getDefault()).startsWith(search.toLowerCase(Locale.getDefault())) && c.getContact().getFullName().toLowerCase(Locale.getDefault()).startsWith(search.toLowerCase(Locale.getDefault()))
@ -176,6 +179,12 @@ public class SearchContactsListAdapter extends BaseAdapter {
} }
} }
} }
if (!searchFound) {
LinphoneContact searchContact = new LinphoneContact();
searchContact.setFullName(search);
result.add(new ContactAddress(searchContact, searchAddress, false));
}
oldSize = search.length(); oldSize = search.length();
contacts = result; contacts = result;
resultContactsSearch.setAdapter(this); resultContactsSearch.setAdapter(this);