From 23a4e1e6fada4eb5309db35efcf80d6f1f6f4d34 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Thu, 9 Jul 2015 14:26:19 +0200
Subject: Display trust status in ContactDetailsActivity

---
 .../siacs/conversations/ui/ContactDetailsActivity.java |  3 +++
 src/main/res/layout/contact_key.xml                    | 18 +++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index 33861f82..4ff47f9e 100644
--- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -383,11 +383,14 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 			View view = inflater.inflate(R.layout.contact_key, keys, false);
 			TextView key = (TextView) view.findViewById(R.id.key);
 			TextView keyType = (TextView) view.findViewById(R.id.key_type);
+			TextView keyTrust = (TextView) view.findViewById(R.id.key_trust);
 			ImageButton remove = (ImageButton) view
 					.findViewById(R.id.button_remove);
 			remove.setVisibility(View.VISIBLE);
+			keyTrust.setVisibility(View.VISIBLE);
 			keyType.setText("Axolotl Fingerprint");
 			key.setText(CryptoHelper.prettifyFingerprint(identityKey.getFingerprint()));
+			keyTrust.setText(contact.getAccount().getAxolotlService().getFingerprintTrust(contact.getJid().toBareJid().toString(), identityKey.getFingerprint().replaceAll("\\s","")).toString());
 			keys.addView(view);
 			remove.setOnClickListener(new OnClickListener() {
 
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 933b72b4..79b9af62 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -3,12 +3,11 @@
     android:layout_width="wrap_content"
     android:layout_height="match_parent" >
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_toLeftOf="@+id/button_remove"
-        android:orientation="vertical"
         android:padding="8dp" >
 
         <TextView
@@ -16,6 +15,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/black87"
+            android:layout_alignParentLeft="true"
             android:textSize="?attr/TextSizeBody"
             android:typeface="monospace" />
 
@@ -24,8 +24,20 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/black54"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@+id/key"
             android:textSize="?attr/TextSizeInfo"/>
-    </LinearLayout>
+
+        <TextView
+            android:id="@+id/key_trust"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@+id/key"
+            android:visibility="gone"
+            android:textColor="@color/black54"
+            android:textSize="?attr/TextSizeInfo"/>
+    </RelativeLayout>
 
     <ImageButton
         android:id="@+id/button_remove"
-- 
cgit v1.2.3