diff options
| -rw-r--r-- | src/main/java/de/pixart/messenger/persistance/FileBackend.java | 2 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/persistance/FileBackend.java b/src/main/java/de/pixart/messenger/persistance/FileBackend.java index 7be0492bb..727892af0 100644 --- a/src/main/java/de/pixart/messenger/persistance/FileBackend.java +++ b/src/main/java/de/pixart/messenger/persistance/FileBackend.java @@ -278,7 +278,7 @@ public class FileBackend { } public boolean useFileAsIs(Uri uri) { - String path = uri.getPath(); + String path = getOriginalPath(uri); if (path == null) { return false; } diff --git a/src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java b/src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java index e7dde2f84..119670453 100644 --- a/src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java +++ b/src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java @@ -39,7 +39,7 @@ public class AttachFileToConversationRunnable implements Runnable, MediaTranscod this.message = message; this.callback = callback; final String mimeType = MimeUtils.guessMimeTypeFromUri(mXmppConnectionService, uri); - this.isVideoMessage = (mimeType != null && mimeType.startsWith("video/") && (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2 || !getFileBackend().useFileAsIs(uri))); + this.isVideoMessage = (mimeType != null && mimeType.startsWith("video/") && (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2)) && !getFileBackend().useFileAsIs(uri); } public boolean isVideoMessage() { |