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

Fix NPE

Browse source
This commit is contained in:
Sylvain Berfini 2012-12-21 14:10:36 +01:00
parent 3860136d94
commit 7fb02ae0ba
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/org/linphone/LinphoneActivity.java
View file

@ -1103,6 +1103,9 @@ public class LinphoneActivity extends FragmentActivity implements
public void run() { public void run() {
for (int i = 0; i < sipContactCursor.getCount(); i++) { for (int i = 0; i < sipContactCursor.getCount(); i++) {
Contact contact = Compatibility.getContact(getContentResolver(), sipContactCursor, i); Contact contact = Compatibility.getContact(getContentResolver(), sipContactCursor, i);
if (contact == null)
continue;
contact.refresh(getContentResolver()); contact.refresh(getContentResolver());
if (!isContactPresenceDisabled) { if (!isContactPresenceDisabled) {
searchFriendAndAddToContact(contact); searchFriendAndAddToContact(contact);
@ -1111,8 +1114,11 @@ public class LinphoneActivity extends FragmentActivity implements
} }
for (int i = 0; i < contactCursor.getCount(); i++) { for (int i = 0; i < contactCursor.getCount(); i++) {
Contact contact = Compatibility.getContact(getContentResolver(), contactCursor, i); Contact contact = Compatibility.getContact(getContentResolver(), contactCursor, i);
if (contact == null)
continue;
for (Contact c : sipContactList) { for (Contact c : sipContactList) {
if (c.getID().equals(contact.getID())) { if (c != null && c.getID().equals(contact.getID())) {
contact = c; contact = c;
break; break;
} }