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/ConversationActivity.java | |
| parent | 58a07c4ca2652a4fb92fe7da7c3861b4ffbccab4 (diff) | |
| parent | 183dad281c6d610b8a4cffa1f13c923a6e423355 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 17faaf383..986abf6a5 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -417,7 +417,7 @@ public class ConversationActivity extends XmppActivity } if (this.getSelectedConversation().getMode() == Conversation.MODE_MULTI) { menuContactDetails.setVisible(false); - menuAttach.setVisible(getSelectedConversation().getAccount().httpUploadAvailable()); + menuAttach.setVisible(getSelectedConversation().getAccount().httpUploadAvailable() && getSelectedConversation().getMucOptions().participating()); menuInviteContact.setVisible(getSelectedConversation().getMucOptions().canInvite()); menuSecure.setVisible(!Config.HIDE_ENCRYPTION_IN_UI); menuSecure.setVisible(!Config.HIDE_PGP_IN_UI); //if pgp is hidden conferences have no choice of encryption |