Merge branch 'master' into bubble-into-avatar

7 files changed, 452 insertions, 223 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java
index 01b432d65..e37ea6121 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java
@@ -24,7 +24,7 @@ import de.pixart.messenger.R;
 import de.pixart.messenger.entities.Account;
 import de.pixart.messenger.ui.ManageAccountActivity;
 import de.pixart.messenger.ui.XmppActivity;
-import de.pixart.messenger.ui.util.Color;
+import de.pixart.messenger.ui.util.StyledAttributes;
 import de.pixart.messenger.utils.UIHelper;
 
 public class AccountAdapter extends ArrayAdapter<Account> {
@@ -65,14 +65,14 @@ public class AccountAdapter extends ArrayAdapter<Account> {
         statusView.setText(getContext().getString(account.getStatus().getReadableId()));
         switch (account.getStatus()) {
             case ONLINE:
-                statusView.setTextColor(Color.get(activity, R.attr.TextColorOnline));
+                statusView.setTextColor(StyledAttributes.getColor(activity, R.attr.TextColorOnline));
                 break;
             case DISABLED:
             case CONNECTING:
-                statusView.setTextColor(Color.get(activity, android.R.attr.textColorSecondary));
+                statusView.setTextColor(StyledAttributes.getColor(activity, android.R.attr.textColorSecondary));
                 break;
             default:
-                statusView.setTextColor(Color.get(activity, R.attr.TextColorError));
+                statusView.setTextColor(StyledAttributes.getColor(activity, R.attr.TextColorError));
                 break;
         }
         final SwitchCompat tglAccountState = view.findViewById(R.id.tgl_account_status);
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
index 5294ba7cd..55dd6d65f 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
@@ -31,7 +31,7 @@ import de.pixart.messenger.entities.MucOptions;
 import de.pixart.messenger.entities.Transferable;
 import de.pixart.messenger.ui.ConversationFragment;
 import de.pixart.messenger.ui.XmppActivity;
-import de.pixart.messenger.ui.util.Color;
+import de.pixart.messenger.ui.util.StyledAttributes;
 import de.pixart.messenger.ui.widget.UnreadCountCustomView;
 import de.pixart.messenger.utils.EmojiWrapper;
 import de.pixart.messenger.utils.IrregularUnicodeDetector;
@@ -97,9 +97,9 @@ public class ConversationAdapter extends RecyclerView.Adapter<ConversationAdapte
         }
 
         if (conversation == ConversationFragment.getConversation(activity)) {
-            viewHolder.frame.setBackgroundColor(Color.get(activity, R.attr.color_background_tertiary));
+            viewHolder.frame.setBackgroundColor(StyledAttributes.getColor(activity, R.attr.color_background_tertiary));
         } else {
-            viewHolder.frame.setBackgroundColor(Color.get(activity,R.attr.color_background_primary));
+            viewHolder.frame.setBackgroundColor(StyledAttributes.getColor(activity, R.attr.color_background_secondary));
         }
 
         Message message = conversation.getLatestMessage();
@@ -250,11 +250,11 @@ public class ConversationAdapter extends RecyclerView.Adapter<ConversationAdapte
                     viewHolder.name.setTextColor(ContextCompat.getColor(activity, R.color.notavailable));
                     break;
                 default:
-                    viewHolder.name.setTextColor(Color.get(activity, R.attr.text_Color_Main));
+                    viewHolder.name.setTextColor(StyledAttributes.getColor(activity, R.attr.text_Color_Main));
                     break;
             }
         } else {
-            viewHolder.name.setTextColor(Color.get(activity, R.attr.text_Color_Main));
+            viewHolder.name.setTextColor(StyledAttributes.getColor(activity, R.attr.text_Color_Main));
         }
 
         if (activity.xmppConnectionService.indicateReceived()) {
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/KnownHostsAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/KnownHostsAdapter.java
index 9f4a52d95..2e0bfccc6 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/KnownHostsAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/KnownHostsAdapter.java
@@ -7,8 +7,6 @@ import android.widget.Filter;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.Locale;
 
 public class KnownHostsAdapter extends ArrayAdapter<String> {
@@ -17,34 +15,31 @@ public class KnownHostsAdapter extends ArrayAdapter<String> {
 
         @Override
         protected FilterResults performFiltering(CharSequence constraint) {
-            if (constraint != null) {
-                ArrayList<String> suggestions = new ArrayList<>();
-                final String[] split = constraint.toString().split("@");
-                if (split.length == 1) {
-                    for (String domain : domains) {
-                        suggestions.add(split[0].toLowerCase(Locale
-                                .getDefault()) + "@" + domain);
-                    }
-                } else if (split.length == 2) {
-                    for (String domain : domains) {
-                        if (domain.contentEquals(split[1])) {
-                            suggestions.clear();
-                            break;
-                        } else if (domain.contains(split[1])) {
-                            suggestions.add(split[0].toLowerCase(Locale
-                                    .getDefault()) + "@" + domain);
-                        }
-                    }
-                } else {
+            final ArrayList<String> suggestions = new ArrayList<>();
+            final String[] split = constraint == null ? new String[0] : constraint.toString().split("@");
+            if (split.length == 1) {
+                final String local = split[0].toLowerCase(Locale.ENGLISH);
+                for (String domain : domains) {
+                    suggestions.add(local + "@" + domain);
+                }
+            } else if (split.length == 2) {
+                final String localPart = split[0].toLowerCase(Locale.ENGLISH);
+                final String domainPart = split[1].toLowerCase(Locale.ENGLISH);
+                if (domains.contains(domainPart)) {
                     return new FilterResults();
                 }
-                FilterResults filterResults = new FilterResults();
-                filterResults.values = suggestions;
-                filterResults.count = suggestions.size();
-                return filterResults;
+                for (String domain : domains) {
+                    if (domain.contains(domainPart)) {
+                        suggestions.add(localPart + "@" + domain);
+                    }
+                }
             } else {
                 return new FilterResults();
             }
+            FilterResults filterResults = new FilterResults();
+            filterResults.values = suggestions;
+            filterResults.count = suggestions.size();
+            return filterResults;
         }
 
         @Override
@@ -52,9 +47,7 @@ public class KnownHostsAdapter extends ArrayAdapter<String> {
             ArrayList filteredList = (ArrayList) results.values;
             if (results.count > 0) {
                 clear();
-                for (Object c : filteredList) {
-                    add((String) c);
-                }
+                addAll(filteredList);
                 notifyDataSetChanged();
             }
         }
@@ -62,140 +55,7 @@ public class KnownHostsAdapter extends ArrayAdapter<String> {
 
     public KnownHostsAdapter(Context context, int viewResourceId, Collection<String> mKnownHosts) {
         super(context, viewResourceId, new ArrayList<>());
-
-        if (mKnownHosts == null) {
-            domains = new ArrayList<>();
-        } else {
-            domains = new ArrayList<>(mKnownHosts);
-        }
-
-        HashSet<String> hashSet = new HashSet<>();
-
-        // get servers from https://conversations.im/compliance/
-        new Thread(() -> {
-            domains.add("pix-art.de");
-            domains.add("conversations.im");
-            domains.add("jabber.cat");
-            domains.add("jabjab.de");
-            domains.add("im.koderoot.net");
-            domains.add("riotcat.org");
-            domains.add("magicbroccoli.de");
-            domains.add("kode.im");
-            domains.add("jabber-germany.de");
-            domains.add("simplewire.de");
-            domains.add("suchat.org");
-            domains.add("jabber.at");
-            domains.add("trashserver.net");
-            domains.add("wiuwiu.de");
-            domains.add("5222.de");
-            domains.add("dismail.de");
-            domains.add("chat.sum7.eu");
-            domains.add("xmpp.zone");
-            domains.add("libranet.de");
-            domains.add("laborversuch.de");
-            domains.add("creep.im");
-            domains.add("jabber.systemausfall.org");
-            domains.add("jabber.hot-chilli.net");
-            domains.add("jabber.fr");
-            domains.add("jabber.de");
-            domains.add("draugr.de");
-            domains.add("elaon.de");
-            domains.add("high-way.me");
-            domains.add("jabber.rwth-aachen.de");
-            domains.add("deshalbfrei.org");
-            domains.add("mail.de");
-            domains.add("bommboo.de");
-            domains.add("jabber.systemli.org");
-            domains.add("jabb.im");
-            domains.add("mailbox.org");
-            domains.add("hot-chilli.net");
-            domains.add("jabberpl.org");
-            domains.add("chinwag.im");
-            domains.add("tchncs.de");
-            domains.add("zsim.de");
-            domains.add("patchcord.be");
-            domains.add("gajim.org");
-            domains.add("talker.to");
-            domains.add("pimux.de");
-            domains.add("jabber.home.vdlinde.org");
-            domains.add("im.apinc.org");
-            domains.add("chatme.im");
-            domains.add("fusselkater.org");
-            domains.add("datenknoten.me");
-            domains.add("fysh.in");
-            domains.add("jabber.chaos-darmstadt.de");
-            domains.add("yax.im");
-            domains.add("neko.im");
-            domains.add("jabberzac.org");
-            domains.add("xmpp.is");
-            domains.add("home.zom.im");
-            domains.add("jabber.ccc.de");
-            domains.add("jwchat.org");
-            domains.add("kdetalk.net");
-            domains.add("kde.org");
-            domains.add("riseup.net");
-            domains.add("ruhr-uni-bochum.de");
-            domains.add("njs.netlab.cz");
-            domains.add("schokokeks.org");
-            domains.add("jabber.cz");
-            domains.add("ubuntu-jabber.de");
-            domains.add("xabber.de");
-            domains.add("ubuntu-jabber.net");
-            domains.add("jabber.ru");
-            domains.add("darknet.nz");
-            domains.add("movim.eu");
-            domains.add("404.city");
-            domains.add("igniterealtime.org");
-            domains.add("kapsi.fi");
-            domains.add("jabbel.net");
-            domains.add("joindiaspora.com");
-            domains.add("alpha-labs.net");
-            domains.add("xmppnet.de");
-            domains.add("hoth.one");
-            domains.add("blah.im");
-            domains.add("xmpp.jp");
-            domains.add("jabber.uni-mainz.de");
-            domains.add("richim.org");
-            domains.add("tigase.im");
-            domains.add("jappix.com");
-            domains.add("member.fsf.org");
-            domains.add("jabber.rueckgr.at");
-            domains.add("swissjabber.ch");
-            domains.add("twattle.net");
-            domains.add("jabber.calyxinstitute.org");
-            domains.add("sapo.pt");
-            domains.add("uprod.biz");
-            domains.add("krautspace.de");
-            domains.add("kraut.space");
-            domains.add("null.pm");
-            domains.add("anonymitaet-im-inter.net");
-            domains.add("0nl1ne.at");
-            domains.add("linuxlovers.at");
-            domains.add("jabber.org");
-            domains.add("jabber.no-sense.net");
-            domains.add("swissjabber.eu");
-            domains.add("swissjabber.org");
-            domains.add("swissjabber.de");
-            domains.add("swissjabber.li");
-            domains.add("jabber.no");
-            domains.add("cypherpunks.it");
-            domains.add("adastra.re");
-            domains.add("jabber-br.org");
-            domains.add("einfachjabber.de");
-            domains.add("jabber.smash-net.org");
-            domains.add("freifunk.im");
-            domains.add("openmailbox.org");
-            domains.add("jabber.otr.im");
-            domains.add("evil.im");
-            domains.add("xmpp.slack.com");
-            domains.add("chat.hipchat.com");
-            domains.add("googlemail.com");
-
-            hashSet.addAll(domains);
-            domains.clear();
-            domains.addAll(hashSet);
-            Collections.sort(domains, String::compareToIgnoreCase);
-        }).start();
+        domains = new ArrayList<>(mKnownHosts);
     }
 
     public KnownHostsAdapter(Context context, int viewResourceId) {
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
index 64d432041..17479cf99 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
@@ -27,7 +27,7 @@ import de.pixart.messenger.databinding.ContactBinding;
 import de.pixart.messenger.entities.ListItem;
 import de.pixart.messenger.ui.SettingsActivity;
 import de.pixart.messenger.ui.XmppActivity;
-import de.pixart.messenger.ui.util.Color;
+import de.pixart.messenger.ui.util.StyledAttributes;
 import de.pixart.messenger.utils.IrregularUnicodeDetector;
 import de.pixart.messenger.utils.UIHelper;
 import rocks.xmpp.addr.Jid;
@@ -105,16 +105,16 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> {
             }
         }
         if (offline) {
-            viewHolder.name.setTextColor(Color.get(activity, R.attr.text_Color_Main));
+            viewHolder.name.setTextColor(StyledAttributes.getColor(activity, R.attr.text_Color_Main));
             viewHolder.name.setAlpha(INACTIVE_ALPHA);
             viewHolder.jid.setAlpha(INACTIVE_ALPHA);
             viewHolder.avatar.setAlpha(INACTIVE_ALPHA);
             viewHolder.tags.setAlpha(INACTIVE_ALPHA);
         } else {
             if (ShowPresenceColoredNames()) {
-                viewHolder.name.setTextColor(color != 0 ? color : Color.get(activity, R.attr.text_Color_Main));
+                viewHolder.name.setTextColor(color != 0 ? color : StyledAttributes.getColor(activity, R.attr.text_Color_Main));
             } else {
-                viewHolder.name.setTextColor(Color.get(activity, R.attr.text_Color_Main));
+                viewHolder.name.setTextColor(StyledAttributes.getColor(activity, R.attr.text_Color_Main));
             }
             viewHolder.name.setAlpha(ACTIVE_ALPHA);
             viewHolder.jid.setAlpha(ACTIVE_ALPHA);
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MediaAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MediaAdapter.java
new file mode 100644
index 000000000..0472c6d11
--- /dev/null
+++ b/src/main/java/de/pixart/messenger/ui/adapter/MediaAdapter.java
@@ -0,0 +1,226 @@
+package de.pixart.messenger.ui.adapter;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.databinding.DataBindingUtil;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
+import android.support.annotation.AttrRes;
+import android.support.annotation.DimenRes;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.RejectedExecutionException;
+
+import de.pixart.messenger.R;
+import de.pixart.messenger.databinding.MediaBinding;
+import de.pixart.messenger.ui.XmppActivity;
+import de.pixart.messenger.ui.util.Attachment;
+import de.pixart.messenger.ui.util.StyledAttributes;
+import de.pixart.messenger.ui.util.ViewUtil;
+
+public class MediaAdapter extends RecyclerView.Adapter<MediaAdapter.MediaViewHolder> {
+
+    private static final List<String> DOCUMENT_MIMES = Arrays.asList(
+            "application/pdf",
+            "application/vnd.oasis.opendocument.text",
+            "application/msword",
+            "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+            "text/x-tex",
+            "text/plain"
+    );
+
+    private final ArrayList<Attachment> attachments = new ArrayList<>();
+
+    private final XmppActivity activity;
+
+    private int mediaSize = 0;
+
+    public MediaAdapter(XmppActivity activity, @DimenRes int mediaSize) {
+        this.activity = activity;
+        this.mediaSize = Math.round(activity.getResources().getDimension(mediaSize));
+    }
+
+    public static void setMediaSize(RecyclerView recyclerView, int mediaSize) {
+        RecyclerView.Adapter adapter = recyclerView.getAdapter();
+        if (adapter instanceof MediaAdapter) {
+            ((MediaAdapter) adapter).setMediaSize(mediaSize);
+        }
+    }
+
+    private static @AttrRes
+    int getImageAttr(Attachment attachment) {
+        final @AttrRes int attr;
+        if (attachment.getType() == Attachment.Type.LOCATION) {
+            attr = R.attr.media_preview_location;
+        } else if (attachment.getType() == Attachment.Type.RECORDING) {
+            attr = R.attr.media_preview_recording;
+        } else {
+            final String mime = attachment.getMime();
+            if (mime == null) {
+                attr = R.attr.media_preview_unknown;
+            } else if (mime.startsWith("audio/")) {
+                attr = R.attr.media_preview_audio;
+            } else if (mime.equals("text/calendar") || (mime.equals("text/x-vcalendar"))) {
+                attr = R.attr.media_preview_calendar;
+            } else if (mime.equals("text/x-vcard")) {
+                attr = R.attr.media_preview_contact;
+            } else if (mime.equals("application/vnd.android.package-archive")) {
+                attr = R.attr.media_preview_app;
+            } else if (mime.equals("application/zip") || mime.equals("application/rar")) {
+                attr = R.attr.media_preview_archive;
+            } else if (DOCUMENT_MIMES.contains(mime)) {
+                attr = R.attr.media_preview_document;
+            } else {
+                attr = R.attr.media_preview_unknown;
+            }
+        }
+        return attr;
+    }
+
+    public static void renderPreview(Context context, Attachment attachment, ImageView imageView) {
+        imageView.setBackgroundColor(StyledAttributes.getColor(context, R.attr.color_background_tertiary));
+        imageView.setImageAlpha(Math.round(StyledAttributes.getFloat(context, R.attr.icon_alpha) * 255));
+        imageView.setImageDrawable(StyledAttributes.getDrawable(context, getImageAttr(attachment)));
+    }
+
+    private static boolean cancelPotentialWork(Attachment attachment, ImageView imageView) {
+        final BitmapWorkerTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
+
+        if (bitmapWorkerTask != null) {
+            final Attachment oldAttachment = bitmapWorkerTask.attachment;
+            if (oldAttachment == null || !oldAttachment.equals(attachment)) {
+                bitmapWorkerTask.cancel(true);
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private static BitmapWorkerTask getBitmapWorkerTask(ImageView imageView) {
+        if (imageView != null) {
+            final Drawable drawable = imageView.getDrawable();
+            if (drawable instanceof AsyncDrawable) {
+                final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable;
+                return asyncDrawable.getBitmapWorkerTask();
+            }
+        }
+        return null;
+    }
+
+    @NonNull
+    @Override
+    public MediaViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        LayoutInflater layoutInflater = LayoutInflater.from(parent.getContext());
+        MediaBinding binding = DataBindingUtil.inflate(layoutInflater, R.layout.media, parent, false);
+        return new MediaViewHolder(binding);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull MediaViewHolder holder, int position) {
+        final Attachment attachment = attachments.get(position);
+        if (attachment.renderThumbnail()) {
+            holder.binding.media.setImageAlpha(255);
+            loadPreview(attachment, holder.binding.media);
+        } else {
+            cancelPotentialWork(attachment, holder.binding.media);
+            renderPreview(activity, attachment, holder.binding.media);
+        }
+        holder.binding.media.setOnClickListener(v -> ViewUtil.view(activity, attachment));
+    }
+
+    public void setAttachments(List<Attachment> attachments) {
+        this.attachments.clear();
+        this.attachments.addAll(attachments);
+        notifyDataSetChanged();
+    }
+
+    private void setMediaSize(int mediaSize) {
+        this.mediaSize = mediaSize;
+    }
+
+    private void loadPreview(Attachment attachment, ImageView imageView) {
+        if (cancelPotentialWork(attachment, imageView)) {
+            final Bitmap bm = activity.xmppConnectionService.getFileBackend().getPreviewForUri(attachment, mediaSize, true);
+            if (bm != null) {
+                cancelPotentialWork(attachment, imageView);
+                imageView.setImageBitmap(bm);
+                imageView.setBackgroundColor(0x00000000);
+            } else {
+                imageView.setBackgroundColor(0xff333333);
+                imageView.setImageDrawable(null);
+                final BitmapWorkerTask task = new BitmapWorkerTask(imageView);
+                final AsyncDrawable asyncDrawable = new AsyncDrawable(activity.getResources(), null, task);
+                imageView.setImageDrawable(asyncDrawable);
+                try {
+                    task.execute(attachment);
+                } catch (final RejectedExecutionException ignored) {
+                }
+            }
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return attachments.size();
+    }
+
+    static class AsyncDrawable extends BitmapDrawable {
+        private final WeakReference<BitmapWorkerTask> bitmapWorkerTaskReference;
+
+        AsyncDrawable(Resources res, Bitmap bitmap, BitmapWorkerTask bitmapWorkerTask) {
+            super(res, bitmap);
+            bitmapWorkerTaskReference = new WeakReference<>(bitmapWorkerTask);
+        }
+
+        BitmapWorkerTask getBitmapWorkerTask() {
+            return bitmapWorkerTaskReference.get();
+        }
+    }
+
+    class MediaViewHolder extends RecyclerView.ViewHolder {
+
+        private final MediaBinding binding;
+
+        MediaViewHolder(MediaBinding binding) {
+            super(binding.getRoot());
+            this.binding = binding;
+        }
+    }
+
+    class BitmapWorkerTask extends AsyncTask<Attachment, Void, Bitmap> {
+        private final WeakReference<ImageView> imageViewReference;
+        private Attachment attachment = null;
+
+        BitmapWorkerTask(ImageView imageView) {
+            imageViewReference = new WeakReference<>(imageView);
+        }
+
+        @Override
+        protected Bitmap doInBackground(Attachment... params) {
+            this.attachment = params[0];
+            return activity.xmppConnectionService.getFileBackend().getPreviewForUri(this.attachment, mediaSize, false);
+        }
+
+        @Override
+        protected void onPostExecute(Bitmap bitmap) {
+            if (bitmap != null && !isCancelled()) {
+                final ImageView imageView = imageViewReference.get();
+                if (imageView != null) {
+                    imageView.setImageBitmap(bitmap);
+                    imageView.setBackgroundColor(0x00000000);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MediaPreviewAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MediaPreviewAdapter.java
new file mode 100644
index 000000000..ae4c42816
--- /dev/null
+++ b/src/main/java/de/pixart/messenger/ui/adapter/MediaPreviewAdapter.java
@@ -0,0 +1,188 @@
+package de.pixart.messenger.ui.adapter;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.res.Resources;
+import android.databinding.DataBindingUtil;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.RejectedExecutionException;
+
+import de.pixart.messenger.R;
+import de.pixart.messenger.databinding.MediaPreviewBinding;
+import de.pixart.messenger.ui.ConversationFragment;
+import de.pixart.messenger.ui.XmppActivity;
+import de.pixart.messenger.ui.util.Attachment;
+
+public class MediaPreviewAdapter extends RecyclerView.Adapter<MediaPreviewAdapter.MediaPreviewViewHolder> {
+
+    private final ArrayList<Attachment> mediaPreviews = new ArrayList<>();
+
+    private final ConversationFragment conversationFragment;
+
+    public MediaPreviewAdapter(ConversationFragment fragment) {
+        this.conversationFragment = fragment;
+    }
+
+    private static boolean cancelPotentialWork(Attachment attachment, ImageView imageView) {
+        final BitmapWorkerTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
+
+        if (bitmapWorkerTask != null) {
+            final Attachment oldAttachment = bitmapWorkerTask.attachment;
+            if (oldAttachment == null || !oldAttachment.equals(attachment)) {
+                bitmapWorkerTask.cancel(true);
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private static BitmapWorkerTask getBitmapWorkerTask(ImageView imageView) {
+        if (imageView != null) {
+            final Drawable drawable = imageView.getDrawable();
+            if (drawable instanceof AsyncDrawable) {
+                final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable;
+                return asyncDrawable.getBitmapWorkerTask();
+            }
+        }
+        return null;
+    }
+
+    @NonNull
+    @Override
+    public MediaPreviewViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        LayoutInflater layoutInflater = LayoutInflater.from(parent.getContext());
+        MediaPreviewBinding binding = DataBindingUtil.inflate(layoutInflater, R.layout.media_preview, parent, false);
+        return new MediaPreviewViewHolder(binding);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull MediaPreviewViewHolder holder, int position) {
+        final Context context = conversationFragment.getActivity();
+        final Attachment attachment = mediaPreviews.get(position);
+        if (attachment.renderThumbnail()) {
+            holder.binding.mediaPreview.setImageAlpha(255);
+            loadPreview(attachment, holder.binding.mediaPreview);
+        } else {
+            cancelPotentialWork(attachment, holder.binding.mediaPreview);
+            MediaAdapter.renderPreview(context, attachment, holder.binding.mediaPreview);
+        }
+        holder.binding.deleteButton.setOnClickListener(v -> {
+            int pos = mediaPreviews.indexOf(attachment);
+            mediaPreviews.remove(pos);
+            notifyItemRemoved(pos);
+            conversationFragment.toggleInputMethod();
+        });
+    }
+
+    public void addMediaPreviews(List<Attachment> attachments) {
+        this.mediaPreviews.addAll(attachments);
+        notifyDataSetChanged();
+    }
+
+    private void loadPreview(Attachment attachment, ImageView imageView) {
+        if (cancelPotentialWork(attachment, imageView)) {
+            XmppActivity activity = (XmppActivity) conversationFragment.getActivity();
+            final Bitmap bm = activity.xmppConnectionService.getFileBackend().getPreviewForUri(attachment, Math.round(activity.getResources().getDimension(R.dimen.media_preview_size)), true);
+            if (bm != null) {
+                cancelPotentialWork(attachment, imageView);
+                imageView.setImageBitmap(bm);
+                imageView.setBackgroundColor(0x00000000);
+            } else {
+                imageView.setBackgroundColor(0xff333333);
+                imageView.setImageDrawable(null);
+                final BitmapWorkerTask task = new BitmapWorkerTask(imageView);
+                final AsyncDrawable asyncDrawable = new AsyncDrawable(conversationFragment.getActivity().getResources(), null, task);
+                imageView.setImageDrawable(asyncDrawable);
+                try {
+                    task.execute(attachment);
+                } catch (final RejectedExecutionException ignored) {
+                }
+            }
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return mediaPreviews.size();
+    }
+
+    public boolean hasAttachments() {
+        return mediaPreviews.size() > 0;
+    }
+
+    public ArrayList<Attachment> getAttachments() {
+        return mediaPreviews;
+    }
+
+    public void clearPreviews() {
+        this.mediaPreviews.clear();
+    }
+
+    static class AsyncDrawable extends BitmapDrawable {
+        private final WeakReference<BitmapWorkerTask> bitmapWorkerTaskReference;
+
+        AsyncDrawable(Resources res, Bitmap bitmap, BitmapWorkerTask bitmapWorkerTask) {
+            super(res, bitmap);
+            bitmapWorkerTaskReference = new WeakReference<>(bitmapWorkerTask);
+        }
+
+        BitmapWorkerTask getBitmapWorkerTask() {
+            return bitmapWorkerTaskReference.get();
+        }
+    }
+
+    class MediaPreviewViewHolder extends RecyclerView.ViewHolder {
+
+        private final MediaPreviewBinding binding;
+
+        MediaPreviewViewHolder(MediaPreviewBinding binding) {
+            super(binding.getRoot());
+            this.binding = binding;
+        }
+    }
+
+    class BitmapWorkerTask extends AsyncTask<Attachment, Void, Bitmap> {
+        private final WeakReference<ImageView> imageViewReference;
+        private Attachment attachment = null;
+
+        BitmapWorkerTask(ImageView imageView) {
+            imageViewReference = new WeakReference<>(imageView);
+        }
+
+        @Override
+        protected Bitmap doInBackground(Attachment... params) {
+            Activity activity = conversationFragment.getActivity();
+            if (activity instanceof XmppActivity) {
+                final XmppActivity xmppActivity = (XmppActivity) activity;
+                this.attachment = params[0];
+                return xmppActivity.xmppConnectionService.getFileBackend().getPreviewForUri(this.attachment, Math.round(xmppActivity.getResources().getDimension(R.dimen.media_preview_size)), false);
+            } else {
+                return null;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Bitmap bitmap) {
+            if (bitmap != null && !isCancelled()) {
+                final ImageView imageView = imageViewReference.get();
+                if (imageView != null) {
+                    imageView.setImageBitmap(bitmap);
+                    imageView.setBackgroundColor(0x00000000);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
index b720375e7..b13ccb910 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
@@ -2,11 +2,9 @@ package de.pixart.messenger.ui.adapter;
 
 import android.Manifest;
 import android.app.Activity;
-import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ -29,7 +27,6 @@ import android.text.style.RelativeSizeSpan;
 import android.text.style.StyleSpan;
 import android.util.Base64;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -72,11 +69,11 @@ import de.pixart.messenger.services.MessageArchiveService;
 import de.pixart.messenger.services.NotificationService;
 import de.pixart.messenger.ui.ConversationFragment;
 import de.pixart.messenger.ui.ConversationsActivity;
-import de.pixart.messenger.ui.ShowFullscreenMessageActivity;
 import de.pixart.messenger.ui.XmppActivity;
 import de.pixart.messenger.ui.text.DividerSpan;
 import de.pixart.messenger.ui.text.QuoteSpan;
 import de.pixart.messenger.ui.util.MyLinkify;
+import de.pixart.messenger.ui.util.ViewUtil;
 import de.pixart.messenger.ui.widget.ClickableMovementMethod;
 import de.pixart.messenger.ui.widget.CopyTextView;
 import de.pixart.messenger.ui.widget.ListSelectionManager;
@@ -498,7 +495,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
         } else {
             viewHolder.messageBody.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Body1);
         }
-        viewHolder.messageBody.setHighlightColor(darkBackground ? type == SENT ? ContextCompat.getColor(activity, R.color.black26) : ContextCompat.getColor(activity, R.color.grey800) : ContextCompat.getColor(activity, R.color.grey500));
+        viewHolder.messageBody.setHighlightColor(darkBackground ? type == SENT ? ContextCompat.getColor(activity, R.color.accent) : ContextCompat.getColor(activity, R.color.accent) : ContextCompat.getColor(activity, R.color.accent));
         viewHolder.messageBody.setTypeface(null, Typeface.NORMAL);
         if (message.getBody() != null) {
             final String nick = UIHelper.getMessageDisplayName(message);
@@ -1047,52 +1044,10 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
             return;
         }
         String mime = file.getMimeType();
-        if (mime.startsWith("image/")) {
-            Intent intent = new Intent(getContext(), ShowFullscreenMessageActivity.class);
-            intent.putExtra("image", Uri.fromFile(file));
-            try {
-                activity.startActivity(intent);
-                activity.overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
-                return;
-            } catch (ActivityNotFoundException e) {
-                //ignored
-            }
-        } else if (mime.startsWith("video/")) {
-            Intent intent = new Intent(getContext(), ShowFullscreenMessageActivity.class);
-            intent.putExtra("video", Uri.fromFile(file));
-            try {
-                activity.startActivity(intent);
-                activity.overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
-                return;
-            } catch (ActivityNotFoundException e) {
-                //ignored
-            }
-        }
-        Intent openIntent = new Intent(Intent.ACTION_VIEW);
         if (mime == null) {
             mime = "*/*";
         }
-        Uri uri;
-        try {
-            uri = FileBackend.getUriForFile(activity, file);
-        } catch (SecurityException e) {
-            Log.d(Config.LOGTAG, "No permission to access " + file.getAbsolutePath(), e);
-            Toast.makeText(activity, activity.getString(R.string.no_permission_to_access_x, file.getAbsolutePath()), Toast.LENGTH_SHORT).show();
-            return;
-        }
-        openIntent.setDataAndType(uri, mime);
-        openIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        PackageManager manager = activity.getPackageManager();
-        List<ResolveInfo> info = manager.queryIntentActivities(openIntent, 0);
-        if (info.size() == 0) {
-            openIntent.setDataAndType(uri,"*/*");
-        }
-        try {
-            getContext().startActivity(openIntent);
-            activity.overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
-        } catch (ActivityNotFoundException e) {
-            Toast.makeText(activity, R.string.no_application_found_to_open_file, Toast.LENGTH_SHORT).show();
-        }
+        ViewUtil.view(activity, file, mime);
     }
 
     public void showLocation(Message message) {