diff --git a/build.gradle b/build.gradle index 57a607def..c252a1265 100644 --- a/build.gradle +++ b/build.gradle @@ -86,13 +86,13 @@ ext { android { namespace 'eu.siacs.conversations' - compileSdkVersion 32 + compileSdkVersion 33 defaultConfig { minSdkVersion 21 - targetSdkVersion 32 versionCode 42053 versionName "2.12.2" + targetSdkVersion 33 archivesBaseName += "-$versionName" applicationId "eu.siacs.conversations" resValue "string", "applicationId", applicationId diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java index 8519e5dbd..3c193219e 100644 --- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java +++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java @@ -143,7 +143,7 @@ public class FileBackend { "do not consider video file with min width larger than 720 for size check"); continue; } - } catch (NotAVideoFile notAVideoFile) { + } catch (final IOException | NotAVideoFile e) { // ignore and fall through } } @@ -268,7 +268,7 @@ public class FileBackend { return inSampleSize; } - private static Dimensions getVideoDimensions(Context context, Uri uri) throws NotAVideoFile { + private static Dimensions getVideoDimensions(Context context, Uri uri) throws NotAVideoFile, IOException { MediaMetadataRetriever mediaMetadataRetriever = new MediaMetadataRetriever(); try { mediaMetadataRetriever.setDataSource(context, uri); @@ -294,7 +294,7 @@ public class FileBackend { } private static Dimensions getVideoDimensions(MediaMetadataRetriever metadataRetriever) - throws NotAVideoFile { + throws NotAVideoFile, IOException { String hasVideo = metadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_HAS_VIDEO); if (hasVideo == null) { @@ -1527,7 +1527,7 @@ public class FileBackend { Log.d(Config.LOGTAG, "ambiguous file " + mime + " is audio"); body.append("|0|0|").append(getMediaRuntime(file)); } - } catch (final NotAVideoFile e) { + } catch (final IOException | NotAVideoFile e) { Log.d(Config.LOGTAG, "ambiguous file " + mime + " is audio"); body.append("|0|0|").append(getMediaRuntime(file)); } @@ -1547,7 +1547,7 @@ public class FileBackend { .append('|') .append(dimensions.height); } - } catch (NotAVideoFile notAVideoFile) { + } catch (final IOException | NotAVideoFile notAVideoFile) { Log.d( Config.LOGTAG, "file with mime type " + file.getMimeType() + " was not a video file"); @@ -1592,7 +1592,7 @@ public class FileBackend { return new Dimensions(imageHeight, imageWidth); } - private Dimensions getVideoDimensions(File file) throws NotAVideoFile { + private Dimensions getVideoDimensions(final File file) throws NotAVideoFile, IOException { MediaMetadataRetriever metadataRetriever = new MediaMetadataRetriever(); try { metadataRetriever.setDataSource(file.getAbsolutePath());