diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2017-01-03 11:44:14 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2017-01-03 11:44:14 +0100 |
| commit | 470d244414ebacb743112bfb24ca28957e7dde93 (patch) | |
| tree | 3776c8a9344d40f3c9dc8cb3957be4ec479c0166 /src/main/java/eu/siacs/conversations/persistance/FileBackend.java | |
| parent | 2bb7bc1455e9bdcc9065d513fea58589f8179b10 (diff) | |
| parent | 5a670c88b081d3f9b8d33e37fd8d966f04c245fc (diff) | |
Merge branch 'feature-gboardgifs' of https://github.com/illegalprime/Conversations into illegalprime-feature-gboardgifs
Diffstat (limited to 'src/main/java/eu/siacs/conversations/persistance/FileBackend.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/persistance/FileBackend.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java index 84330d16..642df769 100644 --- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java +++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java @@ -55,6 +55,7 @@ import eu.siacs.conversations.utils.CryptoHelper; import eu.siacs.conversations.utils.ExifHelper; import eu.siacs.conversations.utils.FileUtils; import eu.siacs.conversations.utils.FileWriterException; +import eu.siacs.conversations.utils.MimeUtils; import eu.siacs.conversations.xmpp.pep.Avatar; public class FileBackend { @@ -276,7 +277,7 @@ public class FileBackend { } public void copyFileToPrivateStorage(Message message, Uri uri) throws FileCopyException { - String mime = mXmppConnectionService.getContentResolver().getType(uri); + String mime = MimeUtils.guessMimeTypeFromUri(mXmppConnectionService, uri); Log.d(Config.LOGTAG, "copy " + uri.toString() + " to private storage (mime="+mime+")"); String extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mime); if (extension == null) { |