aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-08-12 11:36:47 +0200
committeriNPUTmice <daniel@gultsch.de>2014-08-12 11:36:47 +0200
commit6952e630c413314da1cbc0d335825c7613e4ae93 (patch)
treeb9f723fe1f4e6dd304c130f1fef3c69c64c79748 /src/eu/siacs
parent5ed9c2a8056a017a2ad401e282d4fb6ac9fb5428 (diff)
show user name as well in confernce details if real name was shown
Diffstat (limited to 'src/eu/siacs')
-rw-r--r--src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index b037b8bc..c33277f9 100644
--- a/src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -233,7 +233,6 @@ public class ConferenceDetailsActivity extends XmppActivity {
.findViewById(R.id.contact_display_name);
TextView key = (TextView) view.findViewById(R.id.key);
TextView role = (TextView) view.findViewById(R.id.contact_jid);
- role.setText(getReadableRole(user.getRole()));
if (user.getPgpKeyId() != 0) {
key.setVisibility(View.VISIBLE);
key.setOnClickListener(new OnClickListener() {
@@ -251,15 +250,18 @@ public class ConferenceDetailsActivity extends XmppActivity {
if (contact.showInRoster()) {
bm = contact.getImage(48, this);
name.setText(contact.getDisplayName());
+ role.setText(user.getName() + " \u2022 " + getReadableRole(user.getRole()));
} else {
bm = UIHelper.getContactPicture(user.getName(), 48, this,
false);
name.setText(user.getName());
+ role.setText(getReadableRole(user.getRole()));
}
} else {
bm = UIHelper
.getContactPicture(user.getName(), 48, this, false);
name.setText(user.getName());
+ role.setText(getReadableRole(user.getRole()));
}
ImageView iv = (ImageView) view.findViewById(R.id.contact_photo);
iv.setImageBitmap(bm);