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

Fixed device security level display issue

Browse source
This commit is contained in:
Sylvain Berfini 2018-10-29 15:04:22 +01:00
parent 29e4345ed6
commit 7f7ba181f5
2 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
res/layout/chat_device_cell.xml
View file

@ -13,17 +13,6 @@
android:layout_margin="5dp" android:layout_margin="5dp"
android:gravity="center_vertical"> 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 <TextView
android:id="@+id/name" android:id="@+id/name"
style="@style/font6" style="@style/font6"
@ -33,13 +22,13 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toRightOf="@+id/avatar" android:layout_toRightOf="@+id/avatar"
android:layout_toLeftOf="@+id/security_level" android:layout_toLeftOf="@id/security_level"
android:layout_marginLeft="10dp" android:layout_marginLeft="55dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:layout_centerVertical="true"/> android:layout_centerVertical="true"/>
<ImageView <ImageView
android:id="@id/security_level" android:id="@+id/security_level"
android:src="@drawable/security_alert_indicator" android:src="@drawable/security_alert_indicator"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

4
src/android/org/linphone/contacts/SearchContactsListAdapter.java
View file

@ -30,7 +30,6 @@ import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import org.linphone.LinphoneManager; import org.linphone.LinphoneManager;
import org.linphone.LinphoneUtils;
import org.linphone.R; import org.linphone.R;
import org.linphone.activities.LinphoneActivity; import org.linphone.activities.LinphoneActivity;
import org.linphone.core.Address; import org.linphone.core.Address;
@ -39,7 +38,6 @@ import org.linphone.core.PresenceBasicStatus;
import org.linphone.core.PresenceModel; import org.linphone.core.PresenceModel;
import org.linphone.core.ProxyConfig; import org.linphone.core.ProxyConfig;
import org.linphone.core.SearchResult; import org.linphone.core.SearchResult;
import org.linphone.mediastream.Log;
import org.linphone.ui.ContactAvatar; import org.linphone.ui.ContactAvatar;
import java.util.ArrayList; import java.util.ArrayList;
@ -193,7 +191,7 @@ public class SearchContactsListAdapter extends RecyclerView.Adapter<SearchContac
public void setContactsList(List<ContactAddress> contactsList) { public void setContactsList(List<ContactAddress> contactsList) {
if (contactsList == null) { if (contactsList == null) {
contacts = getContactsList(); contacts = getContactsList();
if (contacts.size() > 0 && progressBar != null) if (progressBar != null)
progressBar.setVisibility(View.GONE); progressBar.setVisibility(View.GONE);
} else { } else {
contacts = contactsList; contacts = contactsList;