1 files changed, 26 insertions, 44 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index cc9fca26..4eb081ce 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -31,7 +31,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-public class ConferenceDetailsActivity extends XmppActivity {
+public class ConferenceDetailsActivity extends XmppActivity implements OnConversationUpdate, OnRenameListener {
 	public static final String ACTION_VIEW_MUC = "view_muc";
 	private Conversation conversation;
 	private TextView mYourNick;
@@ -53,8 +53,28 @@ public class ConferenceDetailsActivity extends XmppActivity {
 		}
 	};
 
-	private List<User> users = new ArrayList<MucOptions.User>();
-	private OnConversationUpdate onConvChanged = new OnConversationUpdate() {
+	@Override
+	public void onRename(final boolean success) {
+		runOnUiThread(new Runnable() {
+
+			@Override
+			public void run() {
+				populateView();
+				if (success) {
+					Toast.makeText(
+							ConferenceDetailsActivity.this,
+							getString(R.string.your_nick_has_been_changed),
+							Toast.LENGTH_SHORT).show();
+				} else {
+					Toast.makeText(ConferenceDetailsActivity.this,
+							getString(R.string.nick_in_use),
+							Toast.LENGTH_SHORT).show();
+				}
+			}
+		});
+	}
+
+	private List<User> users = new ArrayList<>();
 
 		@Override
 		public void onConversationUpdate() {
@@ -66,7 +86,6 @@ public class ConferenceDetailsActivity extends XmppActivity {
 				}
 			});
 		}
-	};
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -142,7 +161,7 @@ public class ConferenceDetailsActivity extends XmppActivity {
 	@Override
 	protected String getShareableUri() {
 		if (conversation!=null) {
-			return "xmpp:"+conversation.getContactJid().split("/")[0]+"?join";
+			return "xmpp:"+conversation.getContactJid().toBareJid().toString()+"?join";
 		} else {
 			return "";
 		}
@@ -156,7 +175,6 @@ public class ConferenceDetailsActivity extends XmppActivity {
 
 	@Override
 	void onBackendConnected() {
-		registerListener();
 		if (getIntent().getAction().equals(ACTION_VIEW_MUC)) {
 			this.uuid = getIntent().getExtras().getString("uuid");
 		}
@@ -169,49 +187,13 @@ public class ConferenceDetailsActivity extends XmppActivity {
 		}
 	}
 
-	@Override
-	protected void onStop() {
-		if (xmppConnectionServiceBound) {
-			xmppConnectionService.removeOnConversationListChangedListener();
-		}
-		super.onStop();
-	}
-
-	protected void registerListener() {
-		xmppConnectionService
-				.setOnConversationListChangedListener(this.onConvChanged);
-		xmppConnectionService.setOnRenameListener(new OnRenameListener() {
-
-			@Override
-			public void onRename(final boolean success) {
-				runOnUiThread(new Runnable() {
-
-					@Override
-					public void run() {
-						populateView();
-						if (success) {
-							Toast.makeText(
-									ConferenceDetailsActivity.this,
-									getString(R.string.your_nick_has_been_changed),
-									Toast.LENGTH_SHORT).show();
-						} else {
-							Toast.makeText(ConferenceDetailsActivity.this,
-									getString(R.string.nick_in_use),
-									Toast.LENGTH_SHORT).show();
-						}
-					}
-				});
-			}
-		});
-	}
-
 	private void populateView() {
 		mAccountJid.setText(getString(R.string.using_account, conversation
-				.getAccount().getJid()));
+				.getAccount().getJid().toBareJid()));
 		mYourPhoto.setImageBitmap(avatarService().get(
 				conversation.getAccount(), getPixel(48)));
 		setTitle(conversation.getName());
-		mFullJid.setText(conversation.getContactJid().split("/", 2)[0]);
+		mFullJid.setText(conversation.getContactJid().toBareJid().toString());
 		mYourNick.setText(conversation.getMucOptions().getActualNick());
 		mRoleAffiliaton = (TextView) findViewById(R.id.muc_role);
 		if (conversation.getMucOptions().online()) {