From 155332f65b5fc5baaaff845f2c288056d7ae12ec Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Fri, 14 Dec 2018 22:03:33 +0100 Subject: limit video transcoding to api >= 18 and other api 16 fixes --- src/main/java/de/pixart/messenger/persistance/FileBackend.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/main/java/de/pixart/messenger/persistance') diff --git a/src/main/java/de/pixart/messenger/persistance/FileBackend.java b/src/main/java/de/pixart/messenger/persistance/FileBackend.java index ddc0e6ee8..5efadd3ff 100644 --- a/src/main/java/de/pixart/messenger/persistance/FileBackend.java +++ b/src/main/java/de/pixart/messenger/persistance/FileBackend.java @@ -21,6 +21,7 @@ import android.os.Environment; import android.os.ParcelFileDescriptor; import android.provider.MediaStore; import android.provider.OpenableColumns; +import android.support.annotation.RequiresApi; import android.support.v4.content.FileProvider; import android.system.Os; import android.system.StructStat; @@ -1158,7 +1159,12 @@ public class FileBackend { if (dimensions != null) { return dimensions; } - int rotation = extractRotationFromMediaRetriever(metadataRetriever); + final int rotation; + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) { + rotation = extractRotationFromMediaRetriever(metadataRetriever); + } else { + rotation = 0; + } boolean rotated = rotation == 90 || rotation == 270; int height; try { @@ -1179,6 +1185,7 @@ public class FileBackend { return rotated ? new Dimensions(width, height) : new Dimensions(height, width); } + @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1) private static int extractRotationFromMediaRetriever(MediaMetadataRetriever metadataRetriever) { String r = metadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION); try { -- cgit v1.2.3