aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/ui/MucDetailsActivity.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-05-22 20:54:54 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-05-28 10:41:55 +0200
commit655565ecccc722ad72e2dbad247d67dbc1b2a911 (patch)
treec57fb50694b885949190f8c67b132ccc12accf4e /src/eu/siacs/conversations/ui/MucDetailsActivity.java
parentb605577cd912e9974263b53f65d0614821403680 (diff)
display pgp key id in muc details and use keys to encrypt groupchat
Diffstat (limited to 'src/eu/siacs/conversations/ui/MucDetailsActivity.java')
-rw-r--r--src/eu/siacs/conversations/ui/MucDetailsActivity.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/ui/MucDetailsActivity.java b/src/eu/siacs/conversations/ui/MucDetailsActivity.java
index bee7789f..48cf6e81 100644
--- a/src/eu/siacs/conversations/ui/MucDetailsActivity.java
+++ b/src/eu/siacs/conversations/ui/MucDetailsActivity.java
@@ -3,6 +3,8 @@ package eu.siacs.conversations.ui;
import java.util.ArrayList;
import java.util.List;
+import org.openintents.openpgp.util.OpenPgpUtils;
+
import eu.siacs.conversations.R;
import eu.siacs.conversations.entities.Conversation;
import eu.siacs.conversations.entities.MucOptions;
@@ -176,12 +178,15 @@ public class MucDetailsActivity extends XmppActivity {
((TextView) view.findViewById(R.id.contact_display_name))
.setText(contact.getName());
TextView role = (TextView) view.findViewById(R.id.contact_jid);
- role.setText(getReadableRole(contact.getRole()));
+ if (contact.getPgpKeyId()==0) {
+ role.setText(getReadableRole(contact.getRole()));
+ } else {
+ role.setText(getReadableRole(contact.getRole())+" \u00B7 "+OpenPgpUtils.convertKeyIdToHex(contact.getPgpKeyId()));
+ }
ImageView imageView = (ImageView) view
.findViewById(R.id.contact_photo);
imageView.setImageBitmap(UIHelper.getContactPicture(contact.getName(), 48,this.getApplicationContext(), false));
membersView.addView(view);
- Log.d(LOGTAG,contact.getName()+" pgp id: "+contact.getPgpKeyId());
}
}
} else {