diff options
| author | Christian S <christian@pix-art.de> | 2015-09-15 10:38:52 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-09-15 10:38:52 +0200 |
| commit | eb829eb307b69989ae4efdcb23cf2d8a28979b33 (patch) | |
| tree | 18d56593e47e1db1e7775c2e7b35ed0325e68ed6 /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | |
| parent | 58a07c4ca2652a4fb92fe7da7c3861b4ffbccab4 (diff) | |
| parent | 183dad281c6d610b8a4cffa1f13c923a6e423355 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index dbeec42ac..8f12b14ce 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -320,11 +320,13 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa } public void updateChatMsgHint() { - if (conversation.getMode() == Conversation.MODE_MULTI - && conversation.getNextCounterpart() != null) { + final boolean multi = conversation.getMode() == Conversation.MODE_MULTI; + if (multi && conversation.getNextCounterpart() != null) { this.mEditMessage.setHint(getString( R.string.send_private_message_to, conversation.getNextCounterpart().getResourcepart())); + } else if (multi && !conversation.getMucOptions().participating()) { + this.mEditMessage.setHint(R.string.you_are_not_participating); } else { switch (conversation.getNextEncryption()) { case Message.ENCRYPTION_NONE: @@ -664,6 +666,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa if (this.conversation.getMode() == Conversation.MODE_MULTI) { this.conversation.setNextCounterpart(null); } + boolean canWrite = this.conversation.getMode() == Conversation.MODE_SINGLE || this.conversation.getMucOptions().participating(); + this.mEditMessage.setEnabled(canWrite); + this.mSendButton.setEnabled(canWrite); this.mEditMessage.setKeyboardListener(null); this.mEditMessage.setText(""); this.mEditMessage.append(this.conversation.getNextMessage()); |