diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-04-01 21:04:17 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-04-01 21:04:17 +0200 |
commit | 5694150e38eaa9db329916a9d6feb00fc03c0ab6 (patch) | |
tree | 46972e89389a59f26c35cc31686819e39a5c3846 /src/main/java/de/pixart/messenger/persistance/FileBackend.java | |
parent | 0aff702a72c54cd1dd6746e3080a4318fe17b72a (diff) |
delegate mime type from intent
Diffstat (limited to 'src/main/java/de/pixart/messenger/persistance/FileBackend.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/persistance/FileBackend.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/persistance/FileBackend.java b/src/main/java/de/pixart/messenger/persistance/FileBackend.java index 9bf826fe1..d936af86f 100644 --- a/src/main/java/de/pixart/messenger/persistance/FileBackend.java +++ b/src/main/java/de/pixart/messenger/persistance/FileBackend.java @@ -28,7 +28,6 @@ import android.util.Base64; import android.util.Base64OutputStream; import android.util.Log; import android.util.LruCache; -import android.webkit.MimeTypeMap; import java.io.ByteArrayOutputStream; import java.io.Closeable; @@ -354,10 +353,10 @@ public class FileBackend { } } - public void copyFileToPrivateStorage(Message message, Uri uri) throws FileCopyException { - String mime = MimeUtils.guessMimeTypeFromUri(mXmppConnectionService, uri); + public void copyFileToPrivateStorage(Message message, Uri uri, String type) throws FileCopyException { + String mime = type != null ? type : MimeUtils.guessMimeTypeFromUri(mXmppConnectionService, uri); Log.d(Config.LOGTAG, "copy " + uri.toString() + " to private storage (mime=" + mime + ")"); - String extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mime); + String extension = MimeUtils.guessExtensionFromMimeType(mime); if (extension == null) { extension = getExtensionFromUri(uri); } |