From 2a82f23f36e56fa18c59d48231b886edd26a3425 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Tue, 15 Jul 2014 17:11:43 +0200 Subject: use nick from bookmark if available --- src/eu/siacs/conversations/ui/MucDetailsActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/eu/siacs/conversations/ui/MucDetailsActivity.java') diff --git a/src/eu/siacs/conversations/ui/MucDetailsActivity.java b/src/eu/siacs/conversations/ui/MucDetailsActivity.java index 8226e381..9ff83f82 100644 --- a/src/eu/siacs/conversations/ui/MucDetailsActivity.java +++ b/src/eu/siacs/conversations/ui/MucDetailsActivity.java @@ -48,7 +48,7 @@ public class MucDetailsActivity extends XmppActivity { public void onClick(View arg0) { MucOptions options = conversation.getMucOptions(); String nick = mYourNick.getText().toString(); - if (!options.getNick().equals(nick)) { + if (!options.getJoinNick().equals(nick)) { xmppConnectionService.renameInMuc(conversation, nick); finish(); } @@ -149,7 +149,7 @@ public class MucDetailsActivity extends XmppActivity { mSubject.setText(conversation.getMucOptions().getSubject()); setTitle(conversation.getName(useSubject)); mFullJid.setText(conversation.getContactJid().split("/")[0]); - mYourNick.setText(conversation.getMucOptions().getNick()); + mYourNick.setText(conversation.getMucOptions().getJoinNick()); mRoleAffiliaton = (TextView) findViewById(R.id.muc_role); if (conversation.getMucOptions().online()) { mMoreDetails.setVisibility(View.VISIBLE); -- cgit v1.2.3