From 7f7ba181f5c23e4c7d87878f935a34974a349761 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 29 Oct 2018 15:04:22 +0100
Subject: [PATCH] Fixed device security level display issue

---
 res/layout/chat_device_cell.xml                 | 17 +++--------------
 .../contacts/SearchContactsListAdapter.java     |  4 +---
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/res/layout/chat_device_cell.xml b/res/layout/chat_device_cell.xml
index 8838da643..e184b312c 100644
--- a/res/layout/chat_device_cell.xml
+++ b/res/layout/chat_device_cell.xml
@@ -13,17 +13,6 @@
         android:layout_margin="5dp"
         android:gravity="center_vertical">
 
-        <RelativeLayout
-            android:id="@+id/avatar"
-            android:visibility="invisible"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center">
-
-            <include layout="@layout/contact_avatar"/>
-
-        </RelativeLayout>
-
         <TextView
             android:id="@+id/name"
             style="@style/font6"
@@ -33,13 +22,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_toRightOf="@+id/avatar"
-            android:layout_toLeftOf="@+id/security_level"
-            android:layout_marginLeft="10dp"
+            android:layout_toLeftOf="@id/security_level"
+            android:layout_marginLeft="55dp"
             android:layout_marginRight="5dp"
             android:layout_centerVertical="true"/>
 
         <ImageView
-            android:id="@id/security_level"
+            android:id="@+id/security_level"
             android:src="@drawable/security_alert_indicator"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/src/android/org/linphone/contacts/SearchContactsListAdapter.java b/src/android/org/linphone/contacts/SearchContactsListAdapter.java
index d63b9db87..a05208605 100644
--- a/src/android/org/linphone/contacts/SearchContactsListAdapter.java
+++ b/src/android/org/linphone/contacts/SearchContactsListAdapter.java
@@ -30,7 +30,6 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import org.linphone.LinphoneManager;
-import org.linphone.LinphoneUtils;
 import org.linphone.R;
 import org.linphone.activities.LinphoneActivity;
 import org.linphone.core.Address;
@@ -39,7 +38,6 @@ import org.linphone.core.PresenceBasicStatus;
 import org.linphone.core.PresenceModel;
 import org.linphone.core.ProxyConfig;
 import org.linphone.core.SearchResult;
-import org.linphone.mediastream.Log;
 import org.linphone.ui.ContactAvatar;
 
 import java.util.ArrayList;
@@ -193,7 +191,7 @@ public class SearchContactsListAdapter extends RecyclerView.Adapter<SearchContac
     public void setContactsList(List<ContactAddress> contactsList) {
         if (contactsList == null) {
             contacts = getContactsList();
-            if (contacts.size() > 0 && progressBar != null)
+            if (progressBar != null)
                 progressBar.setVisibility(View.GONE);
         } else {
             contacts = contactsList;