aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-07-12 19:35:30 +0200
committerChristian Schneppe <christian@pix-art.de>2016-07-12 19:35:30 +0200
commitc61887c68d97c0e9d12c50555dc13e16bdfaf029 (patch)
treead2c98b771440bce6fe11300de09632ca6d35479 /src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
parent9cd9754c05954f20621bb0697d99ae927f9e01c2 (diff)
revert be4aa2afc96b86c89c2fc37735a4b0cf328d7415
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java25
1 files changed, 1 insertions, 24 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index e5f7a529f..e34712615 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -507,25 +507,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
viewHolder.image.setOnLongClickListener(openContextMenu);
}
- private void displayVideoMessage(ViewHolder viewHolder,
- final Message message) {
- viewHolder.aw_player.setVisibility(View.GONE);
- if (viewHolder.download_button != null) {
- viewHolder.download_button.setVisibility(View.GONE);
- }
- viewHolder.messageBody.setVisibility(View.GONE);
- viewHolder.image.setVisibility(View.VISIBLE);
- activity.loadVideoPreview(message, viewHolder.image);
- viewHolder.image.setOnClickListener(new OnClickListener() {
-
- @Override
- public void onClick(View v) {
- openDownloadable(message);
- }
- });
- viewHolder.image.setOnLongClickListener(openContextMenu);
- }
-
private void loadMoreMessages(Conversation conversation) {
conversation.setLastClearHistory(0);
conversation.setHasMessagesLeftOnServer(true);
@@ -690,11 +671,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
if (mimeType != null) {
if (message.getMimeType().startsWith("audio/")) {
displayAudioMessage(viewHolder, message, position);
- } else if (message.getMimeType().startsWith("video/")) {
- displayVideoMessage(viewHolder, message);
- //ToDo add overlay e.g. play button
- }
- else displayOpenableMessage(viewHolder, message);
+ } else displayOpenableMessage(viewHolder, message);
} else displayOpenableMessage(viewHolder, message);
}
} else if (message.getEncryption() == Message.ENCRYPTION_PGP) {