From 3e9029dc8f1a8fa9f5009dd359a4daec161e625b Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 16 Jan 2023 10:39:36 +0100
Subject: [PATCH] bump targetSdk; bump room version

---
 build.gradle                                  |  6 +--
 .../persistance/FileBackend.java              | 49 +++++++++----------
 2 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/build.gradle b/build.gradle
index d5f999bc3..c21a7d2c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,7 +45,7 @@ dependencies {
 
     // Conversations 3.0 dependencies
 
-    def room_version = "2.4.3"
+    def room_version = "2.5.0"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
@@ -117,11 +117,11 @@ ext {
 
 android {
     namespace 'eu.siacs.conversations'
-    compileSdkVersion 32
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 1
         versionName "3.0.0-alpha"
         archivesBaseName += "-$versionName"
diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index 8519e5dbd..f13375f7e 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -26,16 +26,26 @@ import android.util.Base64OutputStream;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.LruCache;
-
 import androidx.annotation.RequiresApi;
 import androidx.annotation.StringRes;
 import androidx.core.content.FileProvider;
 import androidx.exifinterface.media.ExifInterface;
-
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.ByteStreams;
-
+import eu.siacs.conversations.Config;
+import eu.siacs.conversations.R;
+import eu.siacs.conversations.entities.DownloadableFile;
+import eu.siacs.conversations.entities.Message;
+import eu.siacs.conversations.services.AttachFileToConversationRunnable;
+import eu.siacs.conversations.services.XmppConnectionService;
+import eu.siacs.conversations.ui.adapter.MediaAdapter;
+import eu.siacs.conversations.ui.util.Attachment;
+import eu.siacs.conversations.utils.CryptoHelper;
+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;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.File;
@@ -58,20 +68,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.UUID;
 
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.DownloadableFile;
-import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.services.AttachFileToConversationRunnable;
-import eu.siacs.conversations.services.XmppConnectionService;
-import eu.siacs.conversations.ui.adapter.MediaAdapter;
-import eu.siacs.conversations.ui.util.Attachment;
-import eu.siacs.conversations.utils.CryptoHelper;
-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 {
 
     private static final Object THUMBNAIL_LOCK = new Object();
@@ -140,7 +136,8 @@ public class FileBackend {
                     if (dimensions.getMin() > 720) {
                         Log.d(
                                 Config.LOGTAG,
-                                "do not consider video file with min width larger than 720 for size check");
+                                "do not consider video file with min width larger than 720 for"
+                                        + " size check");
                         continue;
                     }
                 } catch (NotAVideoFile notAVideoFile) {
@@ -269,13 +266,12 @@ public class FileBackend {
     }
 
     private static Dimensions getVideoDimensions(Context context, Uri uri) throws NotAVideoFile {
-        MediaMetadataRetriever mediaMetadataRetriever = new MediaMetadataRetriever();
-        try {
+        try (final MediaMetadataRetriever mediaMetadataRetriever = new MediaMetadataRetriever()) {
             mediaMetadataRetriever.setDataSource(context, uri);
-        } catch (RuntimeException e) {
+            return getVideoDimensions(mediaMetadataRetriever);
+        } catch (IOException | RuntimeException e) {
             throw new NotAVideoFile(e);
         }
-        return getVideoDimensions(mediaMetadataRetriever);
     }
 
     private static Dimensions getVideoDimensionsOfFrame(
@@ -324,7 +320,7 @@ public class FileBackend {
         } catch (Exception e) {
             width = -1;
         }
-        metadataRetriever.release();
+        // metadataRetriever.release();
         Log.d(Config.LOGTAG, "extracted video dims " + width + "x" + height);
         return rotated ? new Dimensions(width, height) : new Dimensions(height, width);
     }
@@ -1593,13 +1589,12 @@ public class FileBackend {
     }
 
     private Dimensions getVideoDimensions(File file) throws NotAVideoFile {
-        MediaMetadataRetriever metadataRetriever = new MediaMetadataRetriever();
-        try {
+        try (final MediaMetadataRetriever metadataRetriever = new MediaMetadataRetriever()) {
             metadataRetriever.setDataSource(file.getAbsolutePath());
-        } catch (RuntimeException e) {
+            return getVideoDimensions(metadataRetriever);
+        } catch (IOException | RuntimeException e) {
             throw new NotAVideoFile(e);
         }
-        return getVideoDimensions(metadataRetriever);
     }
 
     private Dimensions getPdfDocumentDimensions(final File file) {