renaming

2 files changed, 25 insertions, 29 deletions

diff --git a/src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index 589268ee3..deddcad70 100644
--- a/src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -171,33 +171,31 @@ public class ConferenceDetailsActivity extends XmppActivity {
 	}
 
 	protected void registerListener() {
-		if (xmppConnectionServiceBound) {
-			xmppConnectionService
-					.setOnConversationListChangedListener(this.onConvChanged);
-			xmppConnectionService.setOnRenameListener(new OnRenameListener() {
+		xmppConnectionService
+				.setOnConversationListChangedListener(this.onConvChanged);
+		xmppConnectionService.setOnRenameListener(new OnRenameListener() {
 
-				@Override
-				public void onRename(final boolean success) {
-					runOnUiThread(new Runnable() {
+			@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();
-							}
+					@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() {
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index ad1cd2838..3d4cffee0 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -736,11 +736,9 @@ public class ConversationActivity extends XmppActivity implements
 	}
 
 	public void registerListener() {
-		if (xmppConnectionServiceBound) {
-			xmppConnectionService.setOnConversationListChangedListener(this);
-			xmppConnectionService.setOnAccountListChangedListener(this);
-			xmppConnectionService.setOnRosterUpdateListener(this);
-		}
+		xmppConnectionService.setOnConversationListChangedListener(this);
+		xmppConnectionService.setOnAccountListChangedListener(this);
+		xmppConnectionService.setOnRosterUpdateListener(this);
 	}
 
 	@Override