diff options
author | Christian Schneppe <christian@pix-art.de> | 2019-02-09 16:05:14 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2019-02-09 16:05:14 +0100 |
commit | 12aa31da8a5f2b1e24b441733d0af8adf2584b1b (patch) | |
tree | 3a7ee0e08b1d8f300d01eb892ed90a9f5ea42754 /src/main/java/de/pixart/messenger/ui/ConversationFragment.java | |
parent | 163f5ae6229c99d72a73215ce1ba72827eefd93b (diff) |
show MediaBrowser icon in chat view
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/ConversationFragment.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index 94ddc3f8e..12b1a5059 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -94,6 +94,7 @@ import de.pixart.messenger.services.MessageArchiveService; import de.pixart.messenger.services.XmppConnectionService; import de.pixart.messenger.ui.adapter.MediaPreviewAdapter; import de.pixart.messenger.ui.adapter.MessageAdapter; +import de.pixart.messenger.ui.interfaces.OnMediaLoaded; import de.pixart.messenger.ui.util.ActivityResult; import de.pixart.messenger.ui.util.Attachment; import de.pixart.messenger.ui.util.ConversationMenuConfigurator; @@ -1126,6 +1127,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke final MenuItem menuArchiveChat = menu.findItem(R.id.action_archive_chat); final MenuItem menuGroupDetails = menu.findItem(R.id.action_group_details); final MenuItem menuContactDetails = menu.findItem(R.id.action_contact_details); + final MenuItem menuMediaBrowser = menu.findItem(R.id.action_mediabrowser); if (conversation != null) { if (conversation.getMode() == Conversation.MODE_MULTI) { @@ -1147,6 +1149,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke menuGroupDetails.setVisible(false); menuContactDetails.setVisible(false); } + menuMediaBrowser.setVisible(true); menuNeedHelp.setVisible(true); menuSearchUpdates.setVisible(false); ConversationMenuConfigurator.configureAttachmentMenu(conversation, menu, activity.xmppConnectionService.getAttachmentChoicePreference(), hasAttachments); @@ -1157,6 +1160,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke menuInviteContact.setVisible(false); menuGroupDetails.setVisible(false); menuContactDetails.setVisible(false); + menuMediaBrowser.setVisible(false); } super.onCreateOptionsMenu(menu, menuInflater); } @@ -1446,6 +1450,9 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke case R.id.action_contact_details: activity.switchToContactDetails(conversation.getContact()); break; + case R.id.action_mediabrowser: + MediaBrowserActivity.launch(activity, conversation); + break; case R.id.action_block: case R.id.action_unblock: final Activity activity = getActivity(); |