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

Fix crash when typing non-ascii characters in search bar

Browse source
This commit is contained in:
Simon Morlat 2018-03-03 17:08:22 +01:00
parent 9c4be3f518
commit 6e5d3f5a94
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -86,7 +86,9 @@ public class SearchContactsListAdapter extends BaseAdapter {
private boolean contactIsSelected(ContactAddress ca) { private boolean contactIsSelected(ContactAddress ca) {
for (ContactAddress c : contactsSelected) { for (ContactAddress c : contactsSelected) {
if (c.getAddress().asStringUriOnly().compareTo(ca.getAddress().asStringUriOnly()) == 0) return true; Address addr = c.getAddress();
if (addr == null) continue;
if (addr.asStringUriOnly().compareTo(ca.getAddress().asStringUriOnly()) == 0) return true;
} }
return false; return false;
} }
@ -166,7 +168,7 @@ public class SearchContactsListAdapter extends BaseAdapter {
searchAddress = search; searchAddress = search;
} }
boolean searchFound = 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.getAddressAsDisplayableString(); String address = c.getAddressAsDisplayableString();

2
submodules/linphone

@ -1 +1 @@
Subproject commit 9c904e7982c661b5a96fa34cbb3aa793e98cf7a8 Subproject commit 2fb4ce6ffc3657719e88c2ae7c97e9f17730962a