From fcb0941e7b7b12cc6c534a63521b0ee21868034a Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Mon, 5 Sep 2022 20:31:08 +0200
Subject: [PATCH] upgrade SDK level to 33

---
 app/src/main/assets/about.html                   |  3 +++
 .../medialibrary/MediaMetadataExtractor.java     | 16 +++++++++++++---
 build.gradle                                     |  4 ++--
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/src/main/assets/about.html b/app/src/main/assets/about.html
index 52f8929f..afacfb03 100644
--- a/app/src/main/assets/about.html
+++ b/app/src/main/assets/about.html
@@ -29,6 +29,9 @@ function show(n) {
 <b>Changelog</b> [<a href='javascript:show("changelog")'>show</a>]
 <pre id='changelog'>
 
+<b>NEXT</b>
+- <b>NEW</b> Upgraded Android SDK level to 33
+
 <b>1.1.0</b>
 - <b>FIX</b> Unbreak plugin integration
 - <b>FIX</b> Always show cover art in notification
diff --git a/app/src/main/java/ch/blinkenlights/android/medialibrary/MediaMetadataExtractor.java b/app/src/main/java/ch/blinkenlights/android/medialibrary/MediaMetadataExtractor.java
index 3c444ce0..109ff8d9 100644
--- a/app/src/main/java/ch/blinkenlights/android/medialibrary/MediaMetadataExtractor.java
+++ b/app/src/main/java/ch/blinkenlights/android/medialibrary/MediaMetadataExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 - 2017 Adrian Ulrich <adrian@blinkenlights.ch>
+ * Copyright (C) 2016 - 2022 Adrian Ulrich <adrian@blinkenlights.ch>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import java.io.FileInputStream;
+import java.io.IOException;
 
 import android.util.Log;
 public class MediaMetadataExtractor extends HashMap<String, ArrayList<String>> {
@@ -316,7 +317,12 @@ public class MediaMetadataExtractor extends HashMap<String, ArrayList<String>> {
 		    mediaTags.extractMetadata(MediaMetadataRetriever.METADATA_KEY_HAS_AUDIO) == null ||
 		    mediaTags.extractMetadata(MediaMetadataRetriever.METADATA_KEY_HAS_VIDEO) != null ||
 		    mediaTags.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION) == null) {
-		    mediaTags.release();
+			try {
+				mediaTags.release();
+			} catch (IOException e) {
+				Log.v("VanillaMusic", "mediaTags.release() failed: " + e);
+			}
+
 			return;
 		}
 
@@ -361,7 +367,11 @@ public class MediaMetadataExtractor extends HashMap<String, ArrayList<String>> {
 		// if bastp was able to parse it (which is stricter than Android's own parser)
 		mIsMediaFile = (containsKey(TITLE) || containsKey(ALBUM) || containsKey(ARTIST) || !bastpType.equals(""));
 
-		mediaTags.release();
+		try {
+			mediaTags.release();
+		} catch (IOException e) {
+			Log.v("VanillaMusic", "mediaTags.release() failed: " + e);
+		}
 	}
 
 	/**
diff --git a/build.gradle b/build.gradle
index e1a76206..1b6a0542 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ allprojects {
     }
 }
 ext {
-    compileSdkVersion = 30
-    targetSdkVersion = 30
+    compileSdkVersion = 33
+    targetSdkVersion = 33
     minSdkVersion = 15
 }