From 5fd28edb36333bbc102cf3ba81ae03944d26293b Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 1 Jul 2019 15:28:41 +0200
Subject: [PATCH] Fixed some logs verbosity

---
 .../org/linphone/contacts/AndroidContact.java | 42 +++++++++----------
 .../linphone/contacts/LinphoneContact.java    |  9 ++--
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/org/linphone/contacts/AndroidContact.java b/app/src/main/java/org/linphone/contacts/AndroidContact.java
index 7540bf743..db16d10be 100644
--- a/app/src/main/java/org/linphone/contacts/AndroidContact.java
+++ b/app/src/main/java/org/linphone/contacts/AndroidContact.java
@@ -209,26 +209,24 @@ class AndroidContact implements Serializable {
     }
 
     void updateNativeContactWithPresenceInfo(String value) {
-        if (!isLinphoneAddressMimeEntryAlreadyExisting(value)) {
-            Log.d("[Contact] Adding presence information " + value);
-            addChangesToCommit(
-                    ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
-                            .withValue(ContactsContract.Data.RAW_CONTACT_ID, mAndroidRawId)
-                            .withValue(
-                                    ContactsContract.Data.MIMETYPE,
-                                    ContactsManager.getInstance()
-                                            .getString(R.string.linphone_address_mime_type))
-                            .withValue("data1", value) // phone number
-                            .withValue(
-                                    "data2",
-                                    ContactsManager.getInstance()
-                                            .getString(R.string.app_name)) // Summary
-                            .withValue("data3", value) // Detail
-                            .build());
-        }
+        Log.d("[Contact] Adding presence information " + value);
+        addChangesToCommit(
+                ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+                        .withValue(ContactsContract.Data.RAW_CONTACT_ID, mAndroidRawId)
+                        .withValue(
+                                ContactsContract.Data.MIMETYPE,
+                                ContactsManager.getInstance()
+                                        .getString(R.string.linphone_address_mime_type))
+                        .withValue("data1", value) // phone number
+                        .withValue(
+                                "data2",
+                                ContactsManager.getInstance()
+                                        .getString(R.string.app_name)) // Summary
+                        .withValue("data3", value) // Detail
+                        .build());
     }
 
-    private boolean isLinphoneAddressMimeEntryAlreadyExisting(String value) {
+    boolean isLinphoneAddressMimeEntryAlreadyExisting(String value) {
         boolean result = false;
 
         ContentResolver resolver = LinphoneService.instance().getContentResolver();
@@ -603,17 +601,17 @@ class AndroidContact implements Serializable {
         if (LinphoneService.instance().getResources().getBoolean(R.bool.use_linphone_tag)) {
             if (mAndroidId != null && (mAndroidRawId == null || !isAndroidRawIdLinphone)) {
                 if (mAndroidRawId == null) {
-                    Log.i("[Contact] RAW ID not found for contact " + mAndroidId);
+                    Log.d("[Contact] RAW ID not found for contact " + mAndroidId);
                     mAndroidRawId = findRawContactID();
                 }
-                Log.i("[Contact] Found RAW ID for contact " + mAndroidId + " : " + mAndroidRawId);
+                Log.d("[Contact] Found RAW ID for contact " + mAndroidId + " : " + mAndroidRawId);
 
                 String linphoneRawId = findLinphoneRawContactId();
                 if (linphoneRawId == null) {
-                    Log.i("[Contact] Linphone RAW ID not found for contact " + mAndroidId);
+                    Log.d("[Contact] Linphone RAW ID not found for contact " + mAndroidId);
                     createRawLinphoneContactFromExistingAndroidContact();
                 } else {
-                    Log.i(
+                    Log.d(
                             "[Contact] Linphone RAW ID found for contact "
                                     + mAndroidId
                                     + " : "
diff --git a/app/src/main/java/org/linphone/contacts/LinphoneContact.java b/app/src/main/java/org/linphone/contacts/LinphoneContact.java
index f8df43ad5..0cfc36da9 100644
--- a/app/src/main/java/org/linphone/contacts/LinphoneContact.java
+++ b/app/src/main/java/org/linphone/contacts/LinphoneContact.java
@@ -559,12 +559,13 @@ public class LinphoneContact extends AndroidContact
             Log.d("[Linphone Contact] Found first name " + data2 + " and last name " + data3);
             setFirstNameAndLastName(data2, data3, false);
         } else {
-            Log.w("[Linphone Contact] Unexpected MIME type " + mime);
+            Log.d("[Linphone Contact] Skipping unused MIME type " + mime);
         }
     }
 
     public synchronized void updateNativeContactWithPresenceInfo() {
         Log.d("[Contact] Trying to update native contact with presence information");
+
         // Creation of the raw contact with the presence information (tablet)
         createRawLinphoneContactFromExistingAndroidContactIfNeeded();
 
@@ -583,8 +584,10 @@ public class LinphoneContact extends AndroidContact
             // If presence is not null
             if (pm != null && pm.getBasicStatus().equals(PresenceBasicStatus.Open)) {
                 Log.d("[Contact] Found presence information for phone number " + value);
-                // Do the action on the contact only once if it has not been done yet
-                updateNativeContactWithPresenceInfo(value);
+                if (!isLinphoneAddressMimeEntryAlreadyExisting(value)) {
+                    // Do the action on the contact only once if it has not been done yet
+                    updateNativeContactWithPresenceInfo(value);
+                }
             }
         }
         saveChangesCommited();