From 5a206e101f3aaaad8aa206be939bc80c97316afb Mon Sep 17 00:00:00 2001
From: Valeri Gokadze <gokadze.v1@gmail.com>
Date: Fri, 6 Dec 2024 13:56:59 +0400
Subject: [PATCH] Make target and compile sdk version 35 again

---
 app/build.gradle                              |  4 ++--
 .../retromusic/util/PackageValidator.kt       | 19 ++++++++++---------
 appthemehelper/build.gradle                   |  4 ++--
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index dd2f699d4..b816bb147 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,12 +5,12 @@ apply plugin: 'kotlin-parcelize'
 apply plugin: 'com.google.devtools.ksp'
 
 android {
-    compileSdk 34
+    compileSdk 35
     namespace "code.name.monkey.retromusic"
 
     defaultConfig {
         minSdk 21
-        targetSdk 34
+        targetSdk 35
 
         vectorDrawables.useSupportLibrary = true
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PackageValidator.kt b/app/src/main/java/code/name/monkey/retromusic/util/PackageValidator.kt
index 012dfc85a..468c77d7c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/PackageValidator.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/PackageValidator.kt
@@ -167,14 +167,14 @@ class PackageValidator(
     private fun buildCallerInfo(callingPackage: String): CallerPackageInfo? {
         val packageInfo = getPackageInfo(callingPackage) ?: return null
 
-        val appName = packageInfo.applicationInfo.loadLabel(packageManager).toString()
-        val uid = packageInfo.applicationInfo.uid
+        val appName = packageInfo.applicationInfo?.loadLabel(packageManager)?.toString() ?: return null
+        val uid = packageInfo.applicationInfo?.uid ?: return null
         val signature = getSignature(packageInfo)
 
-        val requestedPermissions = packageInfo.requestedPermissions
-        val permissionFlags = packageInfo.requestedPermissionsFlags
+        val requestedPermissions = packageInfo.requestedPermissions ?: emptyArray()
+        val permissionFlags = packageInfo.requestedPermissionsFlags ?: IntArray(requestedPermissions.size)
         val activePermissions = mutableSetOf<String>()
-        requestedPermissions?.forEachIndexed { index, permission ->
+        requestedPermissions.forEachIndexed { index, permission ->
             if (permissionFlags[index] and REQUESTED_PERMISSION_GRANTED != 0) {
                 activePermissions += permission
             }
@@ -207,12 +207,13 @@ class PackageValidator(
      */
     @Suppress("deprecation")
     private fun getSignature(packageInfo: PackageInfo): String? {
-        // Security best practices dictate that an app should be signed with exactly one (1)
-        // signature. Because of this, if there are multiple signatures, reject it.
-        return if (packageInfo.signatures == null || packageInfo.signatures.size != 1) {
+        val signatures = packageInfo.signatures
+        return if (signatures == null || signatures.size != 1) {
+            // Security best practices dictate that an app should be signed with exactly one (1)
+            // signature. Because of this, if there are multiple signatures, reject it.
             null
         } else {
-            val certificate = packageInfo.signatures[0].toByteArray()
+            val certificate = signatures[0].toByteArray()
             getSignatureSha256(certificate)
         }
     }
diff --git a/appthemehelper/build.gradle b/appthemehelper/build.gradle
index 999c0efb4..910085347 100644
--- a/appthemehelper/build.gradle
+++ b/appthemehelper/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 android {
-    compileSdk 34
+    compileSdk 35
     namespace "code.name.monkey.appthemehelper"
 
     defaultConfig {
         minSdk 21
-        targetSdk 34
+        targetSdk 35
     }
     buildTypes {
         release {