diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-12-27 20:52:52 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-12-27 20:52:52 +0100 |
| commit | 815421f92acf7fce4664fcda196a31c515379204 (patch) | |
| tree | 3bbb142eb0657679d9b63ec1403feb6c91687434 /src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java | |
| parent | 55058cca9d8ed5343bc4398fe0ea87633d8a485d (diff) | |
added epub and azw mime types. try to resolve application/octet-stream by file extension instead. added preview icons for ebooks
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java b/src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java index d2f623c45..192d9221d 100644 --- a/src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java +++ b/src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java @@ -44,7 +44,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 = Config.FILE_SIZE; this.originalFileSize = FileBackend.getFileSize(mXmppConnectionService, uri); this.isVideoMessage = !getFileBackend().useFileAsIs(uri) |