From c61887c68d97c0e9d12c50555dc13e16bdfaf029 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Tue, 12 Jul 2016 19:35:30 +0200 Subject: revert be4aa2afc96b86c89c2fc37735a4b0cf328d7415 --- .../conversations/ui/adapter/MessageAdapter.java | 25 +--------------------- 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java') 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 { 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 { 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) { -- cgit v1.2.3