From 5694150e38eaa9db329916a9d6feb00fc03c0ab6 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 1 Apr 2018 21:04:17 +0200
Subject: delegate mime type from intent

---
 .../messenger/services/AttachFileToConversationRunnable.java      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java')

diff --git a/src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java b/src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java
index dc14fe636..780be831b 100644
--- a/src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java
+++ b/src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java
@@ -31,17 +31,19 @@ public class AttachFileToConversationRunnable implements Runnable, MediaTranscod
     private final XmppConnectionService mXmppConnectionService;
     private final Message message;
     private final Uri uri;
+    private final String type;
     private final UiCallback<Message> callback;
     private final boolean isVideoMessage;
     private final long originalFileSize;
     private int currentProgress = -1;
 
-    public AttachFileToConversationRunnable(XmppConnectionService xmppConnectionService, Uri uri, Message message, UiCallback<Message> callback) {
+    public AttachFileToConversationRunnable(XmppConnectionService xmppConnectionService, Uri uri, String type, Message message, UiCallback<Message> callback) {
         this.uri = uri;
+        this.type = type;
         this.mXmppConnectionService = xmppConnectionService;
         this.message = message;
         this.callback = callback;
-        final String mimeType = MimeUtils.guessMimeTypeFromUri(mXmppConnectionService, uri);
+        final String mimeType = type != null ? type : MimeUtils.guessMimeTypeFromUri(mXmppConnectionService, uri);
         final int autoAcceptFileSize = Config.FILE_SIZE;
         this.originalFileSize = FileBackend.getFileSize(mXmppConnectionService, uri);
         this.isVideoMessage = !getFileBackend().useFileAsIs(uri)
@@ -68,7 +70,7 @@ public class AttachFileToConversationRunnable implements Runnable, MediaTranscod
             }
         } else {
             try {
-                mXmppConnectionService.getFileBackend().copyFileToPrivateStorage(message, uri);
+                mXmppConnectionService.getFileBackend().copyFileToPrivateStorage(message, uri, type);
                 mXmppConnectionService.getFileBackend().updateFileParams(message);
                 if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
                     final PgpEngine pgpEngine = mXmppConnectionService.getPgpEngine();
-- 
cgit v1.2.3