[Android] Target android 35

[Nicolas Pomepuy]

vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Thu Sep 26 09:12:09 2024 +0200| [eb717a5e84a92ee37930fc4d9240be8eb50ee7d3] | committer: Nicolas Pomepuy

Target android 35

> https://code.videolan.org/videolan/vlc-android/commit/eb717a5e84a92ee37930fc4d9240be8eb50ee7d3
---

 .../vlc-android/src/org/videolan/vlc/PlaybackService.kt    |  5 +++--
 .../src/org/videolan/vlc/gui/dialogs/AboutVersionDialog.kt |  4 ++--
 .../vlc-android/src/org/videolan/vlc/util/AccessControl.kt |  5 +++--
 .../src/org/videolan/vlc/util/ThumbnailsProvider.kt        | 14 ++++++++------
 build.gradle                                               |  4 ++--
 settings.gradle                                            |  4 ++--
 6 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/application/vlc-android/src/org/videolan/vlc/PlaybackService.kt b/application/vlc-android/src/org/videolan/vlc/PlaybackService.kt
index 777458f399..60351ec3ad 100644
--- a/application/vlc-android/src/org/videolan/vlc/PlaybackService.kt
+++ b/application/vlc-android/src/org/videolan/vlc/PlaybackService.kt
@@ -1238,9 +1238,10 @@ class PlaybackService : MediaBrowserServiceCompat(), LifecycleOwner, CoroutineSc
                 bob.putString(MediaMetadataCompat.METADATA_KEY_ALBUM_ART_URI, albumArtUri.toString())
                 if (!carMode) {
                     val cover = AudioUtil.readCoverBitmap(Uri.decode(media.artworkMrl), 512)
-                    if (cover?.config != null)
+                    val config = cover?.config
+                    if (config != null)
                     //In case of format not supported
-                        bob.putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, cover.copy(cover.config, false))
+                        bob.putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, cover.copy(config, false))
                     else
                         bob.putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, ctx.getBitmapFromDrawable(R.drawable.ic_no_media, 512, 512))
                 }
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/dialogs/AboutVersionDialog.kt b/application/vlc-android/src/org/videolan/vlc/gui/dialogs/AboutVersionDialog.kt
index 0634779ee6..b6ccc3c588 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/dialogs/AboutVersionDialog.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/dialogs/AboutVersionDialog.kt
@@ -103,9 +103,9 @@ class AboutVersionDialog : VLCBottomSheetDialogFragment() {
                 requireActivity().packageManager.getPackageInfo(
                     requireActivity().packageName,
                     PackageManager.GET_SIGNING_CERTIFICATES
-                ).signingInfo.apkContentsSigners
+                ).signingInfo?.apkContentsSigners
         var signer = requireActivity().getString(R.string.unknown)
-        signatures.forEach {
+        signatures?.forEach {
             try {
                 val md = MessageDigest.getInstance("SHA1")
                 md.update(it.toByteArray())
diff --git a/application/vlc-android/src/org/videolan/vlc/util/AccessControl.kt b/application/vlc-android/src/org/videolan/vlc/util/AccessControl.kt
index 611c85467a..dd8f8e88c1 100644
--- a/application/vlc-android/src/org/videolan/vlc/util/AccessControl.kt
+++ b/application/vlc-android/src/org/videolan/vlc/util/AccessControl.kt
@@ -139,8 +139,9 @@ object AccessControl {
     private fun getSignature(ctx: Context, callingPackage: String): String? {
         try {
             val packageInfo = ctx.packageManager.getPackageInfoCompat(callingPackage, PackageManager.GET_SIGNATURES)
-            if (packageInfo.signatures != null && packageInfo.signatures.size == 1) {
-                return genSigSha256(packageInfo.signatures[0].toByteArray())
+            val signatures = packageInfo.signatures
+            if (signatures != null && signatures.size == 1) {
+                return genSigSha256(signatures[0].toByteArray())
             }
         } catch (e: PackageManager.NameNotFoundException) {
             Log.e(TAG, "Calling package name not found: $callingPackage", e)
diff --git a/application/vlc-android/src/org/videolan/vlc/util/ThumbnailsProvider.kt b/application/vlc-android/src/org/videolan/vlc/util/ThumbnailsProvider.kt
index 55a70f269c..40384a997c 100644
--- a/application/vlc-android/src/org/videolan/vlc/util/ThumbnailsProvider.kt
+++ b/application/vlc-android/src/org/videolan/vlc/util/ThumbnailsProvider.kt
@@ -85,10 +85,12 @@ object ThumbnailsProvider {
         var bitmap = synchronized(lock) {
             if (media.uri.scheme.isSchemeFile()) ThumbnailUtils.createVideoThumbnail(filePath, MediaStore.Video.Thumbnails.MINI_KIND) else null
         }
-        if (bitmap != null) {
-            val emptyBitmap = Bitmap.createBitmap(bitmap.width, bitmap.height, bitmap.config)
-            if (bitmap.sameAs(emptyBitmap)) { // myBitmap is empty/blank3
-                bitmap = null
+        bitmap?.let { bmp ->
+            bmp.config?.let { config ->
+                val emptyBitmap = Bitmap.createBitmap(bmp.width, bmp.height, config)
+                if (bmp.sameAs(emptyBitmap)) { // myBitmap is empty/blank3
+                    bitmap = null
+                }
             }
         }
         if (bitmap != null) {
@@ -96,7 +98,7 @@ object ThumbnailsProvider {
             if (hasCache) {
                 media.setThumbnail(thumbPath)
                 if (media.id > 0) {
-                    BitmapUtil.saveOnDisk(bitmap, thumbPath)
+                    BitmapUtil.saveOnDisk(bitmap!!, thumbPath)
                     media.artworkURL = thumbPath
                 }
             }
@@ -261,7 +263,7 @@ object ThumbnailsProvider {
                 overlayHeight = minHeight
             }
         }
-        val bmOverlay = Bitmap.createBitmap(overlayWidth, overlayHeight, sourcesImages[0].config)
+        val bmOverlay = Bitmap.createBitmap(overlayWidth, overlayHeight, sourcesImages[0].config!!)
 
         val canvas = Canvas(bmOverlay)
         when (count) {
diff --git a/build.gradle b/build.gradle
index 108170dfc0..f8d378b962 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,8 +51,8 @@ ext {
     medialibraryVersion = '0.13.13' + (vlcMajorVersion == 3 ? '' : '-vlc4') + '-rc17'
     minSdkVersion = vlcMajorVersion == 3 ? 17 : 21
     buildToolsVersion = vlcMajorVersion == 3 ? '35.0.0' : '35.0.0'
-    targetSdkVersion = 34
-    compileSdkVersion = 34 // Dockers: 3.0=36 / 4.0=36
+    targetSdkVersion = 35
+    compileSdkVersion = 35 // Dockers: 3.0=36 / 4.0=36
     desugarLib = '2.0.4'
     androidxLegacyVersion = '1.0.0'
     androidxCoreVersion = '1.12.0'
diff --git a/settings.gradle b/settings.gradle
index 2049113f20..9a10507e09 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,8 +13,8 @@ def vlcMajorVersion = hasProperty('forceVlc4') && getProperty('forceVlc4') ? 4 :
 
 android {
     minSdk = vlcMajorVersion == 3 ? 17 : 21
-    targetSdk = 34
-    compileSdk = 34 // Dockers: 3.0=36 / 4.0=36
+    targetSdk = 35
+    compileSdk = 35 // Dockers: 3.0=36 / 4.0=36
     buildToolsVersion = '35.0.0'
 }