From 815421f92acf7fce4664fcda196a31c515379204 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 27 Dec 2018 20:52:52 +0100
Subject: added epub and azw mime types. try to resolve
 application/octet-stream by file extension instead. added preview icons for
 ebooks

---
 src/main/java/de/pixart/messenger/ui/adapter/MediaAdapter.java | 2 ++
 src/main/java/de/pixart/messenger/ui/util/Attachment.java      | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/ui')

diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MediaAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MediaAdapter.java
index 0472c6d11..8b8c05d05 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/MediaAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/MediaAdapter.java
@@ -78,6 +78,8 @@ public class MediaAdapter extends RecyclerView.Adapter<MediaAdapter.MediaViewHol
                 attr = R.attr.media_preview_app;
             } else if (mime.equals("application/zip") || mime.equals("application/rar")) {
                 attr = R.attr.media_preview_archive;
+            } else if (mime.equals("application/epub+zip") || mime.equals("application/vnd.amazon.mobi8-ebook")) {
+                attr = R.attr.media_preview_ebook;
             } else if (DOCUMENT_MIMES.contains(mime)) {
                 attr = R.attr.media_preview_document;
             } else {
diff --git a/src/main/java/de/pixart/messenger/ui/util/Attachment.java b/src/main/java/de/pixart/messenger/ui/util/Attachment.java
index 96159c1bd..b63510209 100644
--- a/src/main/java/de/pixart/messenger/ui/util/Attachment.java
+++ b/src/main/java/de/pixart/messenger/ui/util/Attachment.java
@@ -115,13 +115,13 @@ public class Attachment implements Parcelable {
                 for (int i = 0; i < clipData.getItemCount(); ++i) {
                     final Uri uri = clipData.getItemAt(i).getUri();
                     Log.d(Config.LOGTAG, "uri=" + uri + " contentType=" + contentType);
-                    final String mime = contentType != null ? contentType : MimeUtils.guessMimeTypeFromUri(context, uri);
+                    final String mime = MimeUtils.guessMimeTypeFromUriAndMime(context, uri, contentType);
                     Log.d(Config.LOGTAG, "mime=" + mime);
                     uris.add(new Attachment(uri, type, mime));
                 }
             }
         } else {
-            final String mime = contentType != null ? contentType : MimeUtils.guessMimeTypeFromUri(context, data);
+            final String mime = MimeUtils.guessMimeTypeFromUriAndMime(context, data, contentType);
             uris.add(new Attachment(data, type, mime));
         }
         return uris;
-- 
cgit v1.2.3