From 61da550aa070299d89a902ba644761272e371a66 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 15 Jan 2017 11:49:28 +0100
Subject: don't show key tile in contact details when there are no keys

---
 src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java | 8 +++-----
 src/main/res/layout/activity_contact_details.xml                 | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
index 349051399..4a77784af 100644
--- a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
@@ -117,6 +117,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
     private Button mShowInactiveDevicesButton;
     private QuickContactBadge badge;
     private LinearLayout keys;
+    private LinearLayout keysWrapper;
     private FlowLayout tags;
     private boolean showDynamicTags = false;
     private boolean showLastSeen = false;
@@ -221,6 +222,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
             }
         });
         keys = (LinearLayout) findViewById(R.id.details_contact_keys);
+        keysWrapper = (LinearLayout) findViewById(R.id.keys_wrapper);
         tags = (FlowLayout) findViewById(R.id.tags);
         mShowInactiveDevicesButton = (Button) findViewById(R.id.show_inactive_devices);
         if (getActionBar() != null) {
@@ -535,11 +537,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
             });
             keys.addView(view);
         }
-        if (hasKeys) {
-            keys.setVisibility(View.VISIBLE);
-        } else {
-            keys.setVisibility(View.GONE);
-        }
+        keysWrapper.setVisibility(hasKeys ? View.VISIBLE : View.GONE);
 
         List<ListItem.Tag> tagList = contact.getTags(this);
         if (tagList.size() == 0 || !this.showDynamicTags) {
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 15e806ae6..46b0f1768 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -144,6 +144,7 @@
         </RelativeLayout>
 
         <LinearLayout
+            android:id="@+id/keys_wrapper"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/activity_vertical_margin"
-- 
cgit v1.2.3