diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-10-05 13:18:28 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-10-05 13:18:28 +0200 |
| commit | f7f7a73ce78bfc22fdeebfdc89946d8ffccaf25f (patch) | |
| tree | 29516de1385c2e88cf850d1a247f42bf97ad2762 /src/eu/siacs/conversations/ui | |
| parent | bf893bee083136f7adfee5671c60a789fd030bb1 (diff) | |
| parent | 54e9235bfcbfc22250bd9a14eb8575003856b91d (diff) | |
Merge pull request #524 from betheg/muc_errors_conditions
MUC: differentiated a few more errors.
Diffstat (limited to 'src/eu/siacs/conversations/ui')
| -rw-r--r-- | src/eu/siacs/conversations/ui/ConversationFragment.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java index c324eb320..2fa6b4544 100644 --- a/src/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/eu/siacs/conversations/ui/ConversationFragment.java @@ -485,6 +485,18 @@ public class ConversationFragment extends Fragment { showSnackbar(R.string.conference_requires_password, R.string.enter_password, enterPassword); break; + case MucOptions.ERROR_BANNED: + showSnackbar(R.string.conference_banned, + R.string.leave, leaveMuc); + break; + case MucOptions.ERROR_MEMBERS_ONLY: + showSnackbar(R.string.conference_members_only, + R.string.leave, leaveMuc); + break; + case MucOptions.KICKED_FROM_ROOM: + showSnackbar(R.string.conference_kicked, + R.string.leave, leaveMuc); + break; default: break; } @@ -493,7 +505,7 @@ public class ConversationFragment extends Fragment { getActivity().invalidateOptionsMenu(); updateChatMsgHint(); if (!activity.shouldPaneBeOpen()) { - activity.xmppConnectionService.markRead(conversation,true); + activity.xmppConnectionService.markRead(conversation, true); activity.updateConversationList(); } this.updateSendButton(); |