aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/persistance
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2019-01-25 22:33:56 +0100
committerChristian Schneppe <christian@pix-art.de>2019-01-25 22:33:56 +0100
commit33c7fc7a61791a40f273453477e30cb814555377 (patch)
tree0bc6d3aaf0098eed4b4a87d90563ae82d223cf0e /src/main/java/de/pixart/messenger/persistance
parent7c45fad36aea764eb274824bca3bbc5def13fd4f (diff)
explicitly set type=images for all media with an image mime type this is in preperation to be able to query the database for all images
Diffstat (limited to 'src/main/java/de/pixart/messenger/persistance')
-rw-r--r--src/main/java/de/pixart/messenger/persistance/FileBackend.java21
1 files changed, 6 insertions, 15 deletions
diff --git a/src/main/java/de/pixart/messenger/persistance/FileBackend.java b/src/main/java/de/pixart/messenger/persistance/FileBackend.java
index 2a809f5bb..fae15dbda 100644
--- a/src/main/java/de/pixart/messenger/persistance/FileBackend.java
+++ b/src/main/java/de/pixart/messenger/persistance/FileBackend.java
@@ -1022,11 +1022,11 @@ public class FileBackend {
public void updateFileParams(Message message, URL url) {
DownloadableFile file = getFile(message);
final String mime = file.getMimeType();
- boolean image = message.getType() == Message.TYPE_IMAGE || (mime != null && mime.startsWith("image/"));
- boolean video = mime != null && mime.startsWith("video/");
- boolean audio = mime != null && mime.startsWith("audio/");
- boolean vcard = mime != null && mime.contains("vcard");
- boolean apk = mime != null && mime.equals("application/vnd.android.package-archive");
+ final boolean image = message.getType() == Message.TYPE_IMAGE || (mime != null && mime.startsWith("image/"));
+ final boolean video = mime != null && mime.startsWith("video/");
+ final boolean audio = mime != null && mime.startsWith("audio/");
+ final boolean vcard = mime != null && mime.contains("vcard");
+ final boolean apk = mime != null && mime.equals("application/vnd.android.package-archive");
final StringBuilder body = new StringBuilder();
if (url != null) {
body.append(url.toString());
@@ -1051,16 +1051,7 @@ public class FileBackend {
}
message.setBody(body.toString());
message.setFileDeleted(false);
- }
-
- public int getMediaRuntime(Uri uri) {
- try {
- MediaMetadataRetriever mediaMetadataRetriever = new MediaMetadataRetriever();
- mediaMetadataRetriever.setDataSource(mXmppConnectionService, uri);
- return Integer.parseInt(mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION));
- } catch (RuntimeException e) {
- return 0;
- }
+ message.setType(image ? Message.TYPE_IMAGE : Message.TYPE_FILE);
}
private int getMediaRuntime(File file) {