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

Fixed contacts without phone or SIP address showing up in list

Browse source
This commit is contained in:
Sylvain Berfini 2019-09-09 10:59:08 +02:00
parent 9776c4cd50
commit d3282648c3
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
View file

@ -194,6 +194,9 @@ class AsyncContactsLoader extends AsyncTask<Void, Void, AsyncContactsLoader.Asyn
Log.w("[Contacts Manager] Task cancelled"); Log.w("[Contacts Manager] Task cancelled");
return data; return data;
} }
if (contact.getNumbersOrAddresses().isEmpty()) {
continue;
}
if (contact.getFullName() == null) { if (contact.getFullName() == null) {
for (LinphoneNumberOrAddress noa : contact.getNumbersOrAddresses()) { for (LinphoneNumberOrAddress noa : contact.getNumbersOrAddresses()) {
@ -224,6 +227,7 @@ class AsyncContactsLoader extends AsyncTask<Void, Void, AsyncContactsLoader.Asyn
data.sipContacts.add(contact); data.sipContacts.add(contact);
} }
} }
data.contacts.add(contact); data.contacts.add(contact);
} }

2
app/src/main/java/org/linphone/utils/ActivityMonitor.java
View file

@ -125,6 +125,7 @@ public class ActivityMonitor implements Application.ActivityLifecycleCallbacks {
@Override @Override
public void run() { public void run() {
if (LinphoneService.isReady()) {
synchronized (LinphoneService.instance()) { synchronized (LinphoneService.instance()) {
if (!isCanceled) { if (!isCanceled) {
if (ActivityMonitor.this.mRunningActivities == 0 && mActive) { if (ActivityMonitor.this.mRunningActivities == 0 && mActive) {
@ -136,3 +137,4 @@ public class ActivityMonitor implements Application.ActivityLifecycleCallbacks {
} }
} }
} }
}