show contact and conference names in details view

2 files changed, 6 insertions, 0 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
index c861f64d5..a040e1964 100644
--- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
@@ -51,6 +51,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
             inviteToConversation(mConversation);
         }
     };
+    private TextView ConferenceName;
     private TextView mYourNick;
     private ImageView mYourPhoto;
     private ImageButton mEditNickButton;
@@ -247,6 +248,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_muc_details);
+        ConferenceName = (TextView) findViewById(R.id.conference_name);
         mYourNick = (TextView) findViewById(R.id.muc_your_nick);
         mYourPhoto = (ImageView) findViewById(R.id.your_photo);
         mEditNickButton = (ImageButton) findViewById(R.id.edit_nick_button);
@@ -548,6 +550,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
             absubtitle.setVisibility(View.GONE);
             absubtitle.setClickable(false);
         }
+        ConferenceName.setText(mConversation.getName());
         mAccountJid.setText(getString(R.string.using_account, account));
         mYourPhoto.setImageBitmap(avatarService().get(mConversation.getAccount(), getPixel(48)));
         setTitle(mConversation.getName());
diff --git a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
index 063054c0b..6270e4721 100644
--- a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
@@ -112,6 +112,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
     private Jid accountJid;
     private TextView lastseen;
     private Jid contactJid;
+    private TextView contactDisplayName;
     private TextView contactJidTv;
     private TextView accountJidTv;
     private TextView statusMessage;
@@ -272,6 +273,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
         this.messageFingerprint = getIntent().getStringExtra("fingerprint");
         setContentView(R.layout.activity_contact_details);
 
+        contactDisplayName = (TextView) findViewById(R.id.contact_display_name);
         contactJidTv = (TextView) findViewById(R.id.details_contactjid);
         accountJidTv = (TextView) findViewById(R.id.details_account);
         lastseen = (TextView) findViewById(R.id.details_lastseen);
@@ -434,6 +436,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
 
         invalidateOptionsMenu();
         setTitle(contact.getDisplayName());
+        contactDisplayName.setText(contact.getDisplayName());
         if (contact.showInRoster()) {
             send.setVisibility(View.VISIBLE);
             receive.setVisibility(View.VISIBLE);