aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorAndreas Straub <andy@strb.org>2015-07-09 14:26:19 +0200
committerAndreas Straub <andy@strb.org>2015-07-19 22:23:25 +0200
commit23a4e1e6fada4eb5309db35efcf80d6f1f6f4d34 (patch)
tree283ee426e156e04136b81c0d86734153bdd75187 /src/main
parentd173913ebabbf8de2725dd296ae6428defd4b3b3 (diff)
Display trust status in ContactDetailsActivity
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java3
-rw-r--r--src/main/res/layout/contact_key.xml18
2 files changed, 18 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index 33861f828..4ff47f9ec 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 933b72b45..79b9af620 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"