diff options
author | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-04-05 12:49:43 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-04-06 15:28:19 +0200 |
commit | 77491039097734ce746b5b46791464bd236d4703 (patch) | |
tree | 2f97f49b740cc66fcf8618b6811a8f189106d830 /src/eu/siacs | |
parent | cc977eee9094b4c006fc56d87772a11c7ac11a08 (diff) |
added attach file action
Diffstat (limited to 'src/eu/siacs')
-rw-r--r-- | src/eu/siacs/conversations/ui/ConversationActivity.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java index f47e8a8c..41ee6336 100644 --- a/src/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/eu/siacs/conversations/ui/ConversationActivity.java @@ -234,6 +234,7 @@ public class ConversationActivity extends XmppActivity { MenuItem menuMucDetails = (MenuItem) menu.findItem(R.id.action_muc_details); MenuItem menuContactDetails = (MenuItem) menu.findItem(R.id.action_contact_details); MenuItem menuInviteContacts = (MenuItem) menu.findItem(R.id.action_invite); + MenuItem menuAttach = (MenuItem) menu.findItem(R.id.action_attach_file); if ((spl.isOpen()&&(spl.isSlideable()))) { menuArchive.setVisible(false); @@ -241,6 +242,7 @@ public class ConversationActivity extends XmppActivity { menuContactDetails.setVisible(false); menuSecure.setVisible(false); menuInviteContacts.setVisible(false); + menuAttach.setVisible(false); } else { ((MenuItem) menu.findItem(R.id.action_add)).setVisible(!spl.isSlideable()); if (this.getSelectedConversation()!=null) { @@ -249,10 +251,12 @@ public class ConversationActivity extends XmppActivity { menuContactDetails.setVisible(false); menuSecure.setVisible(false); menuInviteContacts.setVisible(true); + menuAttach.setVisible(false); } else { menuContactDetails.setVisible(true); menuMucDetails.setVisible(false); menuInviteContacts.setVisible(false); + menuAttach.setVisible(true); if (this.getSelectedConversation().getLatestMessage().getEncryption() != Message.ENCRYPTION_NONE) { menuSecure.setIcon(R.drawable.ic_action_secure); } |