From d3282648c3925b3e3c97356c8c1361f612bb6b69 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 9 Sep 2019 10:59:08 +0200
Subject: [PATCH] Fixed contacts without phone or SIP address showing up in
 list

---
 .../org/linphone/contacts/AsyncContactsLoader.java   |  4 ++++
 .../java/org/linphone/utils/ActivityMonitor.java     | 12 +++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java b/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
index f47918bc0..862678b12 100644
--- a/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
+++ b/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
@@ -194,6 +194,9 @@ class AsyncContactsLoader extends AsyncTask<Void, Void, AsyncContactsLoader.Asyn
                 Log.w("[Contacts Manager] Task cancelled");
                 return data;
             }
+            if (contact.getNumbersOrAddresses().isEmpty()) {
+                continue;
+            }
 
             if (contact.getFullName() == null) {
                 for (LinphoneNumberOrAddress noa : contact.getNumbersOrAddresses()) {
@@ -224,6 +227,7 @@ class AsyncContactsLoader extends AsyncTask<Void, Void, AsyncContactsLoader.Asyn
                     data.sipContacts.add(contact);
                 }
             }
+
             data.contacts.add(contact);
         }
 
diff --git a/app/src/main/java/org/linphone/utils/ActivityMonitor.java b/app/src/main/java/org/linphone/utils/ActivityMonitor.java
index 8bf2268db..56a6dee98 100644
--- a/app/src/main/java/org/linphone/utils/ActivityMonitor.java
+++ b/app/src/main/java/org/linphone/utils/ActivityMonitor.java
@@ -125,11 +125,13 @@ public class ActivityMonitor implements Application.ActivityLifecycleCallbacks {
 
         @Override
         public void run() {
-            synchronized (LinphoneService.instance()) {
-                if (!isCanceled) {
-                    if (ActivityMonitor.this.mRunningActivities == 0 && mActive) {
-                        mActive = false;
-                        onBackgroundMode();
+            if (LinphoneService.isReady()) {
+                synchronized (LinphoneService.instance()) {
+                    if (!isCanceled) {
+                        if (ActivityMonitor.this.mRunningActivities == 0 && mActive) {
+                            mActive = false;
+                            onBackgroundMode();
+                        }
                     }
                 }
             }