mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-18 03:48:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix NPE

Browse source
This commit is contained in:
Sylvain Berfini 2012-12-21 14:10:36 +01:00
parent 68ecbfa110
commit 129d666049
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() {
for (int i = 0; i < sipContactCursor.getCount(); i++) {
Contact contact = Compatibility.getContact(getContentResolver(), sipContactCursor, i);
if (contact == null)
continue;
contact.refresh(getContentResolver());
if (!isContactPresenceDisabled) {
searchFriendAndAddToContact(contact);
@ -1111,8 +1114,11 @@ public class LinphoneActivity extends FragmentActivity implements
}
for (int i = 0; i < contactCursor.getCount(); i++) {
Contact contact = Compatibility.getContact(getContentResolver(), contactCursor, i);
if (contact == null)
continue;
for (Contact c : sipContactList) {
if (c.getID().equals(contact.getID())) {
if (c != null && c.getID().equals(contact.getID())) {
contact = c;
break;
}