From 3eaa48fa460c017ec5b0438e3fcbdaa26638efe9 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 22 Dec 2018 13:02:45 +0100
Subject: [PATCH] added epub and azw mime types. try to resolve
 application/octet-stream by file extension instead. added preview icons for
 ebooks

---
 .../persistance/FileBackend.java              |   2 +-
 .../AttachFileToConversationRunnable.java     |   2 +-
 .../services/MessageArchiveService.java       |   1 +
 .../ui/adapter/MediaAdapter.java              |   2 ++
 .../conversations/ui/util/Attachment.java     |   4 +--
 .../siacs/conversations/utils/MimeUtils.java  |  26 ++++++++++++++++--
 .../siacs/conversations/utils/UIHelper.java   |   2 ++
 .../res/drawable-hdpi/ic_book_black_48dp.png  | Bin 0 -> 278 bytes
 .../res/drawable-hdpi/ic_book_white_48dp.png  | Bin 0 -> 283 bytes
 .../res/drawable-mdpi/ic_book_black_48dp.png  | Bin 0 -> 201 bytes
 .../res/drawable-mdpi/ic_book_white_48dp.png  | Bin 0 -> 197 bytes
 .../res/drawable-xhdpi/ic_book_black_48dp.png | Bin 0 -> 340 bytes
 .../res/drawable-xhdpi/ic_book_white_48dp.png | Bin 0 -> 350 bytes
 .../drawable-xxhdpi/ic_book_black_48dp.png    | Bin 0 -> 516 bytes
 .../drawable-xxhdpi/ic_book_white_48dp.png    | Bin 0 -> 532 bytes
 .../drawable-xxxhdpi/ic_book_black_48dp.png   | Bin 0 -> 750 bytes
 .../drawable-xxxhdpi/ic_book_white_48dp.png   | Bin 0 -> 766 bytes
 src/main/res/values/attrs.xml                 |   1 +
 src/main/res/values/strings.xml               |   1 +
 src/main/res/values/themes.xml                |   2 ++
 20 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 src/main/res/drawable-hdpi/ic_book_black_48dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_book_white_48dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_book_black_48dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_book_white_48dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_book_black_48dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_book_white_48dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_book_black_48dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_book_white_48dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_book_black_48dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_book_white_48dp.png

diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index df3b63bf9..16412c985 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -570,7 +570,7 @@ public class FileBackend {
     }
 
     public void copyFileToPrivateStorage(Message message, Uri uri, String type) throws FileCopyException {
-        String mime = type != null ? type : MimeUtils.guessMimeTypeFromUri(mXmppConnectionService, uri);
+        String mime = MimeUtils.guessMimeTypeFromUriAndMime(mXmppConnectionService, uri, type);
         Log.d(Config.LOGTAG, "copy " + uri.toString() + " to private storage (mime=" + mime + ")");
         String extension = MimeUtils.guessExtensionFromMimeType(mime);
         if (extension == null) {
diff --git a/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java b/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java
index 506d812dd..330e4cb8a 100644
--- a/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java
+++ b/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java
@@ -47,7 +47,7 @@ public class AttachFileToConversationRunnable implements Runnable, MediaTranscod
 		this.mXmppConnectionService = xmppConnectionService;
 		this.message = message;
 		this.callback = callback;
-		final String mimeType = type != null ? type : MimeUtils.guessMimeTypeFromUri(mXmppConnectionService, uri);
+		final String mimeType = MimeUtils.guessMimeTypeFromUriAndMime(mXmppConnectionService, uri, type);
 		final int autoAcceptFileSize = mXmppConnectionService.getResources().getInteger(R.integer.auto_accept_filesize);
 		this.originalFileSize = FileBackend.getFileSize(mXmppConnectionService,uri);
 		this.isVideoMessage = (mimeType != null && mimeType.startsWith("video/")) && originalFileSize > autoAcceptFileSize;
diff --git a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
index 0b139c0e6..5dce21e95 100644
--- a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
+++ b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
@@ -337,6 +337,7 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 			query.getConversation().setFirstMamReference(first == null ? null : first.getContent());
 		}
 		if (complete || relevant == null || abort) {
+			//TODO: FIX done logic to look at complete. using count is probably unreliable because it can be ommited and doesn’t work with paging.
 			boolean done;
 			if (query.isCatchup()) {
 				done = false;
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java
index 8adb55415..63d9b2447 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java
@@ -77,6 +77,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/eu/siacs/conversations/ui/util/Attachment.java b/src/main/java/eu/siacs/conversations/ui/util/Attachment.java
index a4ed47fdb..4a13be151 100644
--- a/src/main/java/eu/siacs/conversations/ui/util/Attachment.java
+++ b/src/main/java/eu/siacs/conversations/ui/util/Attachment.java
@@ -142,13 +142,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;
diff --git a/src/main/java/eu/siacs/conversations/utils/MimeUtils.java b/src/main/java/eu/siacs/conversations/utils/MimeUtils.java
index a90fee07a..7fecc8fc8 100644
--- a/src/main/java/eu/siacs/conversations/utils/MimeUtils.java
+++ b/src/main/java/eu/siacs/conversations/utils/MimeUtils.java
@@ -16,6 +16,7 @@
 package eu.siacs.conversations.utils;
 import android.content.Context;
 import android.net.Uri;
+import android.util.Log;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -26,6 +27,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
+import eu.siacs.conversations.Config;
 import eu.siacs.conversations.entities.Transferable;
 
 /**
@@ -49,6 +51,7 @@ public final class MimeUtils {
         // by guessExtensionFromMimeType.
         add("application/andrew-inset", "ez");
         add("application/dsptype", "tsp");
+        add("application/epub+zip","pub");
         add("application/hta", "hta");
         add("application/mac-binhex40", "hqx");
         add("application/mathematica", "nb");
@@ -64,6 +67,9 @@ public final class MimeUtils {
         add("application/rdf+xml", "rdf");
         add("application/rss+xml", "rss");
         add("application/zip", "zip");
+        add("application/vnd.amazon.mobi8-ebook","azw3");
+        add("application/vnd.amazon.mobi8-ebook","azw");
+        add("application/vnd.amazon.mobi8-ebook","kfx");
         add("application/vnd.android.package-archive", "apk");
         add("application/vnd.cinderella", "cdy");
         add("application/vnd.ms-pki.stl", "stl");
@@ -493,6 +499,19 @@ public final class MimeUtils {
         return mimeTypeToExtensionMap.get(mimeType.split(";")[0]);
     }
 
+    public static String guessMimeTypeFromUriAndMime(final Context context, final Uri uri, final String mime) {
+        Log.d(Config.LOGTAG,"guessMimeTypeFromUriAndMime "+uri+" and mime="+mime);
+        if (mime == null || mime.equals("application/octet-stream")) {
+            final String guess = guessMimeTypeFromUri(context, uri);
+            if (guess != null) {
+                return guess;
+            } else {
+                return mime;
+            }
+        }
+        return guessMimeTypeFromUri(context ,uri);
+    }
+
     public static String guessMimeTypeFromUri(Context context, Uri uri) {
         // try the content resolver
         String mimeType;
@@ -502,11 +521,14 @@ public final class MimeUtils {
             mimeType = null;
         }
         // try the extension
-        if (mimeType == null && uri.getPath() != null) {
+        if ((mimeType == null || mimeType.equals("application/octet-stream")) && uri.getPath() != null) {
             String path = uri.getPath();
             int start = path.lastIndexOf('.') + 1;
             if (start < path.length()) {
-                mimeType = MimeUtils.guessMimeTypeFromExtension(path.substring(start));
+                final String guess = MimeUtils.guessMimeTypeFromExtension(path.substring(start));
+                if (guess != null) {
+                    mimeType = guess;
+                }
             }
         }
         // sometimes this works (as with the commit content api)
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index daee298fc..d7afd2bbc 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -482,6 +482,8 @@ public class UIHelper {
 			return context.getString(R.string.apk);
 		} else if (mime.contains("vcard")) {
 			return context.getString(R.string.vcard);
+		} else if (mime.equals("application/epub+zip") || mime.equals("application/vnd.amazon.mobi8-ebook")) {
+			return context.getString(R.string.ebook);
 		} else {
 			return mime;
 		}
diff --git a/src/main/res/drawable-hdpi/ic_book_black_48dp.png b/src/main/res/drawable-hdpi/ic_book_black_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fa172d245a7ad0c6212e934241602ad6e4fa2da
GIT binary patch
literal 278
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw?s~d7hEy=Vy}38{uz`r{!{ER<
zim&$Yi=W_YF>x}QyzBzMfal)5EsVEiFS9x}uqZqfU$x`;wVEGXrB0fmrtT?Eys9qA
z>3lH}xwdH%&$i1!6OvUWa}Q69Rgqk$y!)bv$>h6NMM{)+zd!$9Z>o<%Ba4s+m{{<i
ziStS2QF(Te9TO~s`xvYYC+ssTSjG8iPx1f4Pv@lf@o5zNeEMc)0Aq+v<0<tC4osXX
zaN>)_E&e@6MNB5f=5uwWT;DLe(5^t_$|lLeIE^(6lb?M%;$NxsD8MW9jWApAMdhxv
S$r?b9GI+ZBxvX<aXaWFLRcwd=

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-hdpi/ic_book_white_48dp.png b/src/main/res/drawable-hdpi/ic_book_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d181a32150bcf934b86306b219750398149c9220
GIT binary patch
literal 283
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw9(lSrhEy=Vy|pp-uz^5pVwgyJ
zhxPlztecn<`zM@vqM5_lu_P|;P{W&d{xexNFip77%Jk{q_5;`N@0_K%^n=Q|I}xkd
zW!<Ije3ChR`(pCN6YE%>yxf>|;CZvqG}%v%={nh;9nE!Se|EfIynmfWBa4uS0)+U-
zr4sO9>IT_>CtN;9bQ`|S`SI$=J~fRG=jP78Td917(RH0ozS1>@sp=CPm^f8n#8kBj
z4*hFoKUnGPe$w0*G3}EhuX0%JgVS=HY|7`jfp%wDTrk=kW-Klw7tUpLYd=uy1@+Pp
W$9+fZ#ZCf!%i!ti=d#Wzp$Py;&~)Gc

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-mdpi/ic_book_black_48dp.png b/src/main/res/drawable-mdpi/ic_book_black_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..00f29d339f7c4ca43dd9c8adf4e39d4dacf05655
GIT binary patch
literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D37#&FAr*{ouN(3;IS8~q-2X&I
zBt?I7`6Xf92bEtq+88*WW+Wyi9y+m!bJq8Nb^B9xJ6b<s(pCPJYHWM(`=5r~oDTxJ
z(*lpbI;NA5RQm1JWtk)TOiU~s0s+O9VbdA4&gn=TJJgw#uTXUO-Y%i<tbaHK6dW2F
z>RFy$V)vNOx@434gSl)rF2}b#EEeKrpYx4D=}Ro<ch<cNfNo>(boFyt=akR{0DUe@
AQ2+n{

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-mdpi/ic_book_white_48dp.png b/src/main/res/drawable-mdpi/ic_book_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a5ee30413ad39c997b57f58a6e150ec9d5eb729
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D9#0p?kch)?uUqpuIEc6<E-lqK
zlJ=%kv~q2`YKKCgT(8?<1LLMY%lFRwt$O*cLV$ix%cO~`&t6eUd(HmNOhRDFjgYy_
zi$x9QGDo{_Ud+NFpzxrXL6DbsqIkoEIjjw>Jr@ieytY^0oV1HIPtBo$fsv_>>C8U<
v3Aea3{>U}jZoD}+(lGYF4A<hXuRez5m7Ka9ee{<U&|M6ku6{1-oD!M<48=&P

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xhdpi/ic_book_black_48dp.png b/src/main/res/drawable-xhdpi/ic_book_black_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd3412ce6afd8e67b95376635d5793f54211ca35
GIT binary patch
literal 340
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z$oqM;uuoF`1ZDA)*%N8_mA6+
z_qu&k{i3ilxSDNh%0t~v`j?zFxV}lfQj4G7w1eZ!6~hnr{xkhN=w5bs$(b`}>|R(F
zss5`B=PNNudE3kT@k;NPke_z{+ch@i>K$s+*rIp-t^3Aa6P4@2tlQOgCI=pv_hg+b
zqxhum-M+fw4+EK4I0O_N8W<Rn87m|uRy^li@#B$?z?`2;W=Su2I{m>m;kPvmrpzA`
zn7_Ve&TB8;f7@`c-h+1qa_?P!J2fZ?V;BN4mXlN90dt3Q;DNp;yB0O5o;2-You9b(
z@ErN1wI_m(PSe<sFE*k3g0bDtiZGoMQHN*QPFMe9QLeN6?!K8bZ_3xpmALLr4Bi9`
OEe20lKbLh*2~7aqo`;wK

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xhdpi/ic_book_white_48dp.png b/src/main/res/drawable-xhdpi/ic_book_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..938eff46c509d0011f7d3c90694fe147c97de8ae
GIT binary patch
literal 350
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z^Ll!;uuoF`1bb3+(Q8(Zi(fF
z**p4m*b<kgusQ5V;QlUnN<d-4B-4gt>QB2TaC@KsA@y?3?Oh+#|Gw2ebLLFjkx6ab
z<@4^&HMY*`N;H47nYDV^+QkcHxHmkQ-N85IF~c{Pt<uaJRMz!b$zKq-X(nHwxGC7~
zfnUn@nghv44@he=GF1sHI5aRYGO=(7z!?D-F9q#YTkvGEHbc0bMm+C^N7MiR-B88q
zAmtaYd-V@vrbYi!!?WTO+Ac>+UCv=(<P?}N9nA=sSsxgW%skQevq5&^+Ru!pvVo<0
zo-;g>Ps-Ie#xO;u<3;!O7zZVj65;;z$#wSZ6V|1j?vy_N?%2fATXk#--&lN#K<@g$
ZzT42z<Ahav9WdM&JYD@<);T3K0RT>hf;RvF

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xxhdpi/ic_book_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_book_black_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac4437d17c29bd7842232707aebc0b5a8beee100
GIT binary patch
literal 516
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ)^zFrM~waSW+oe0$eEPuNk${bTqu
zk(2N49cSm55Zv%YKx&82kI9!rw^?{)OgPL~AhL0T)T*gXDZQ&_-ktw#Z@&Fe_g`0=
zXM#cN>c?%e{9l&LT$_HrZ@Y<4*lAhj%xBU+&aeuX997ml!MA5gQFhRVy~~oqmo!v6
zE{&3NX8QYRj#jNA>s@!PD~2tsQact@m@hdH9lR$tW5Ifn_lhPL_`9yRv;Fe@c<G~P
z<>n(SLLLf@XoLW!5Q>TgmpQL&OmtSiu<_iF1Hzq0gx^~VzxW?kqi%cKR=aVYe3;cH
z-nkBs6J_sL<aD!2@oR6d4)bO{B_H<hh8W`%`!#<y>N086NBm5VW(nxwRGHwwghuqD
z@d<Fhn49?ff2?a`yA`}Ae_`V`k@rB)n%?}=v2CGKd17PU%AnJV3g=Fq-|*M(?<AkP
z6aU*z?R_NhVu#+$1#SL3n~zKGcsl1~*3Puk^XxY_zr49Q)fXE6tgq!IncYm5#;s5W
P#x8@WtDnm{r-UW|rP9m(

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xxhdpi/ic_book_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_book_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..059b0e65b4493fe5f482f8c39a49ac16764e9ff5
GIT binary patch
literal 532
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ)^zFy8ibaSW+oe0$fn?{a{M`^WHe
zT4_S>)5Q!9tYKQ>kda{gP&rjgXroBRgu_f8B8eOLT4yU9-O+JR+1&2=wY<7Z@p|!_
zGG>B7pkeyqX>H!C7p5K7R$Eg1ZchJloy?tIqU;L3+c(JF6kaOp@6CL+<J#v*4*f1~
zJT(_+Rx5pLzHQ_n-+61dkb|ghVD`?_{3hx}oBudSD}C3rzcB4Y?P>li0z2pbZ2aYw
z9&?gK$U~tKnczU-p-F<cQhq>URm8?cLNBh|{V<K0f&E^A@`d~5=fnGcAKL41{IJ#4
zF0Tc75w)es()t1BYZ`ZL>=js%AMrO?S}@@MhPGp7Tnip1e(lR;acD%h9A@1vWEa5%
zv5UPhpP2oLxmLZXv~Iz9m%O?1FTR@EE5CByGWm}~r)psIlq#O;^4|W$-*bL7^MCrk
zT71bQhtBjjOuergL!>keAKK<N*k5mo4ys)6ZrPp`-?RF9Yujd-Zhm)s9^;AAY$_8R
i<~cBN0x1yjoqgI;#mv9TFFpWco59o7&t;ucLK6UvIL#{n

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xxxhdpi/ic_book_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_book_black_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7bac608b5748ae3eefcd82cc96c08eb24862636
GIT binary patch
literal 750
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE1xWt5x}=AJfoZF!i(^Oy<J;^0UMb-c#~zkn
zyBb){A2yRmInsk)^scXwpon-tkZ=AWSCK0!5_8moHA`Q}@8R<^>QQ(SCh&gaxzE+p
zKg8Ib>s9fb1V)$sXKA<3Or3bUL{q*dHgD4j9rl~2+FvZMIq!T*>Yd&FO_Nvso^#n|
z`I?Wr=A=yV`fWH}llP6%<d7TsJN+_KPQSVK{cHSklP#%gD_6)D&AfC&&&bPk?lO}d
zkE`V7o%dxb**a(8d(GawX<WZ1wWl$@+cfi_wNGZnZ^=E8ml-be+*_2{P|5awTV_Kl
z+xl#&2b#^{|B~}#SLOhHOntE79mC@}|2KaWU|?|jsoSrqS$Sr?<X(M-hV?(SpT_?-
zj=#^%aKPfZ=K41_kImT`KKy!EnX2D+@isF<MP)_Yn(KyI+Pn_;4`2Q*F?A~2g69uk
z*7uz9V!rVC!xwwE)TN9sDl2};FWz*C;fsyU-~PbJOom^w^Zp&@aHw4`M19ZTGSOlB
zr4RFrD$ISEb&M;zmoYwr1-0X4hHA+@Yws*K*|j@oNz*=4?t*Drw>+=E5H6YHWtA!P
zK;!Bc%laiI+wOnX6g53*v~*!?s`b>Zw*?M{*7>#i7F|5?@uuI>-l92qXXEYMe@<C7
zJ7wB#)4y-6PFu(?I{PMlR^_zHsOJ2-nU%|Ko_2$!uSsG0^~_z$7wxZ>oBam4+0)g}
JWt~$(698N&1hW7D

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xxxhdpi/ic_book_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_book_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..12f649c036c88d3bcecefd2d01b787d5e93c4eec
GIT binary patch
literal 766
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE1xWt5x}=AJf$6BHi(^Oy<J&8aUbh`(+&|uw
zT>Xtt?bW7B%{xNAn7wriuyIg%q*~SCV0QG;w!2<eQbRtKf4r5tFtx<%MbFQ@-)#@E
z?>l)00p7$XH7mRM>{$MI?e)UrErRVi6U6o(S+xDIYQIi0f6RufW(Ty=Z8o1NopUK$
zG+}nOQpwQ;t_}TngqCXVUdxzM?7d_ePZU$danp;t7G38%ASq~_$(qofu5`^XgZaUv
z6}?dm73Y-$XK##?f6#G4_6oa%;LgO_2F{7n*V%Wd7hV3vAUkpPb@qytTOMqk#=yj(
z&_FZdz$WG|KR;#HGG;M+`Ef>=!M|pa`howfHy*R^|3252QH*<n{k;8C?H4~{IU#?3
z{?qd-bQq0}Pu47UOXd7<>v82*$*JlGP9G00aC^!LRC&l)%ctSb$0_pz6Pcd$FaOiS
zC9F_y^E7>mXM+_d4Sj(pe83^OLm3pP!b;}r_zjeb4*z0kcgfptcYuxGCHGiVZNm}P
zKx_4_3>#eCk39Qwo55p_(8lB-ZHCn~%2Dx=nd}ON30_O`Zm4W!nQ(*GrQk4oP&Pv+
zW4PnF^vPG092Ontls$cCPI8z>DdQ(;gQR0dW{>CCb%t;*NO&z{kaA{<W&U2v;A1>D
z(|cXA<PQLYLD+#oy@A1xfpHE4lLaG70TagqmW*6`#zi{Xs&CAn@B`B|gQu&X%Q~lo
FCIA|T4LAS*

literal 0
HcmV?d00001

diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 7fbeaf5b3..47ae372eb 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -61,6 +61,7 @@
     <attr name="media_preview_app" format="reference"/>
     <attr name="media_preview_calendar" format="reference"/>
     <attr name="media_preview_archive" format="reference" />
+    <attr name="media_preview_ebook" format="reference"/>
     <attr name="media_preview_unknown" format="reference" />
 
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index dd616212f..f0fbe841e 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -804,4 +804,5 @@
     <string name="start_orbot">Start Orbot</string>
     <string name="no_market_app_installed">No market app installed.</string>
     <string name="group_chat_will_make_your_jabber_id_public">This group chat will make your Jabber ID public</string>
+    <string name="ebook">e-book</string>
 </resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 5532817e9..70841d057 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -72,6 +72,7 @@
         <item type="reference" name="media_preview_app">@drawable/ic_android_black_48dp</item>
         <item type="reference" name="media_preview_calendar">@drawable/ic_event_black_48dp</item>
         <item type="reference" name="media_preview_archive">@drawable/ic_archive_black_48dp</item>
+        <item type="reference" name="media_preview_ebook">@drawable/ic_book_black_48dp</item>
         <item type="reference" name="media_preview_unknown">@drawable/ic_help_black_48dp</item>
 
         <item type="reference" name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
@@ -184,6 +185,7 @@
         <item type="reference" name="media_preview_app">@drawable/ic_android_white_48dp</item>
         <item type="reference" name="media_preview_calendar">@drawable/ic_event_white_48dp</item>
         <item type="reference" name="media_preview_archive">@drawable/ic_archive_white_48dp</item>
+        <item type="reference" name="media_preview_ebook">@drawable/ic_book_white_48dp</item>
         <item type="reference" name="media_preview_unknown">@drawable/ic_help_white_48dp</item>
 
         <item type="reference" name="icon_add_group">@drawable/ic_group_add_white_24dp</item>