aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2016-02-14 17:30:24 +0100
committerChristian S <christian@pix-art.de>2016-02-14 17:30:24 +0100
commit2879ddadca409d05eb71ca0863980ed0ec6b1023 (patch)
tree8cde0a54f6d1a85155c08877fbfab3b788242837 /src/main
parent5e64737d532e493c00ab579ce8bd4695c4a5a5a2 (diff)
try to automatically rejoin muc after beeing kicked
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationFragment.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index ddb3c6f84..b4a0e743d 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -789,7 +789,8 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
showSnackbar(R.string.conference_members_only, R.string.leave, leaveMuc);
break;
case MucOptions.KICKED_FROM_ROOM:
- showSnackbar(R.string.conference_kicked, R.string.join, joinMuc);
+ //showSnackbar(R.string.conference_kicked, R.string.join, joinMuc);
+ activity.xmppConnectionService.joinMuc(conversation);
break;
case MucOptions.ERROR_UNKNOWN:
showSnackbar(R.string.conference_unknown_error, R.string.try_again, joinMuc);