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

Fix crash in search chat view when a contact didn't have a name

Browse source
This commit is contained in:
Erwan Croze 2016-11-29 10:59:41 +01:00
parent 5a746abfac
commit caff7b87d7
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/linphone/ChatFragment.java
View file

@ -947,7 +947,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
for (ContactAddress c : searchAdapter.contacts) { for (ContactAddress c : searchAdapter.contacts) {
String address = c.address; String address = c.address;
if (address.startsWith("sip:")) address = address.substring(4); if (address.startsWith("sip:")) address = address.substring(4);
if (c.contact.getFullName().toLowerCase(Locale.getDefault()).startsWith(search.toLowerCase(Locale.getDefault())) if (c.contact.getFullName() != null && c.contact.getFullName().toLowerCase(Locale.getDefault()).startsWith(search.toLowerCase(Locale.getDefault()))
|| address.toLowerCase(Locale.getDefault()).startsWith(search.toLowerCase(Locale.getDefault()))) { || address.toLowerCase(Locale.getDefault()).startsWith(search.toLowerCase(Locale.getDefault()))) {
result.add(c); result.add(c);
} }

2
src/org/linphone/LinphonePreferences.java
View file

@ -717,6 +717,8 @@ public class LinphonePreferences {
} }
public int getDefaultAccountIndex() { public int getDefaultAccountIndex() {
if (getLc() == null)
return -1;
LinphoneProxyConfig defaultPrxCfg = getLc().getDefaultProxyConfig(); LinphoneProxyConfig defaultPrxCfg = getLc().getDefaultProxyConfig();
if (defaultPrxCfg == null) if (defaultPrxCfg == null)
return -1; return -1;