aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/ui/ConversationFragment.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-10-06 13:34:19 +0200
committeriNPUTmice <daniel@gultsch.de>2014-10-06 13:34:19 +0200
commit16d5429f803dfa6e76110dd83e8f04377358f839 (patch)
treea3110212d42ff78018c95f8d02bbb7b799293d2a /src/eu/siacs/conversations/ui/ConversationFragment.java
parentb788b84c31bc53feb659e1af4dcaad98396c2de7 (diff)
muc options clean up
Diffstat (limited to '')
-rw-r--r--src/eu/siacs/conversations/ui/ConversationFragment.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index 2fa6b454..716e299e 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -131,6 +131,14 @@ public class ConversationFragment extends Fragment {
activity.endConversation(conversation);
}
};
+
+ private OnClickListener joinMuc = new OnClickListener() {
+
+ @Override
+ public void onClick(View v) {
+ activity.xmppConnectionService.joinMuc(conversation);
+ }
+ };
private OnClickListener enterPassword = new OnClickListener() {
@@ -495,7 +503,7 @@ public class ConversationFragment extends Fragment {
break;
case MucOptions.KICKED_FROM_ROOM:
showSnackbar(R.string.conference_kicked,
- R.string.leave, leaveMuc);
+ R.string.join, joinMuc);
break;
default:
break;