From 52150c5257d6c4ef20402392b06c190e0049b4ed Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Thu, 18 Jul 2024 18:46:12 +0200 Subject: [PATCH] Compile SDK 35 --- .../settings/buildinfo/BuildInfoSettingsScreen.kt | 4 ++-- .../de/mm20/launcher2/graphics/BadgeDrawable.kt | 2 +- .../com/balsikandar/crashreporter/utils/AppUtils.kt | 4 ++-- .../de/mm20/launcher2/files/providers/LocalFile.kt | 13 ++++++++----- .../mm20/launcher2/weather/metno/MetNoProvider.kt | 4 ++-- gradle/libs.versions.toml | 2 +- .../java/de/mm20/launcher2/backup/BackupManager.kt | 2 +- .../main/java/de/mm20/launcher2/icons/IconPack.kt | 2 +- .../java/de/mm20/launcher2/music/MusicService.kt | 2 +- .../java/de/mm20/launcher2/plugins/PluginService.kt | 4 ++-- 10 files changed, 21 insertions(+), 18 deletions(-) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreen.kt index b66e8e93..fd5f38d9 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreen.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreen.kt @@ -29,13 +29,13 @@ fun BuildInfoSettingsScreen() { context.packageName, PackageManager.GET_SIGNING_CERTIFICATES ) - pi.signingInfo.apkContentsSigners.firstOrNull() + pi.signingInfo?.apkContentsSigners?.firstOrNull() } else { val pi = context.packageManager.getPackageInfo( context.packageName, PackageManager.GET_SIGNATURES ) - pi.signatures.firstOrNull() + pi.signatures?.firstOrNull() } val signatureHash = if (signature != null) { val digest = MessageDigest.getInstance("SHA") diff --git a/core/base/src/main/java/de/mm20/launcher2/graphics/BadgeDrawable.kt b/core/base/src/main/java/de/mm20/launcher2/graphics/BadgeDrawable.kt index 1b2be654..7c46ec7b 100644 --- a/core/base/src/main/java/de/mm20/launcher2/graphics/BadgeDrawable.kt +++ b/core/base/src/main/java/de/mm20/launcher2/graphics/BadgeDrawable.kt @@ -30,7 +30,7 @@ class BadgeDrawable(context: Context, drawable: Drawable) : Drawable() { } val bitmap = drw.toBitmap(size, size).run { if(isMutable) this - else this.copy(config, true) + else this.copy(config ?: Bitmap.Config.ARGB_8888, true) } this.drawable = BitmapDrawable(context.resources, bitmap) } diff --git a/core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/AppUtils.kt b/core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/AppUtils.kt index ed092368..9fdf8eb3 100644 --- a/core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/AppUtils.kt +++ b/core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/AppUtils.kt @@ -12,13 +12,13 @@ internal fun getAppSignature(context: Context): String { context.packageName, PackageManager.GET_SIGNING_CERTIFICATES ) - pi.signingInfo.apkContentsSigners.firstOrNull() + pi.signingInfo?.apkContentsSigners?.firstOrNull() } else { val pi = context.packageManager.getPackageInfo( context.packageName, PackageManager.GET_SIGNATURES ) - pi.signatures.firstOrNull() + pi.signatures?.firstOrNull() } return if (signature != null) { val digest = MessageDigest.getInstance("SHA") diff --git a/data/files/src/main/java/de/mm20/launcher2/files/providers/LocalFile.kt b/data/files/src/main/java/de/mm20/launcher2/files/providers/LocalFile.kt index 8d35333e..c96fdb52 100644 --- a/data/files/src/main/java/de/mm20/launcher2/files/providers/LocalFile.kt +++ b/data/files/src/main/java/de/mm20/launcher2/files/providers/LocalFile.kt @@ -357,12 +357,15 @@ internal data class LocalFile( mimeType == "application/vnd.android.package-archive" -> { val pkgInfo = context.packageManager.getPackageArchiveInfo(path, 0) ?: return metaData.toImmutableMap() - metaData[FileMetaType.AppName] = - pkgInfo.applicationInfo.loadLabel(context.packageManager).toString() + + pkgInfo.applicationInfo?.loadLabel(context.packageManager)?.toString()?.let { + metaData[FileMetaType.AppName] = it + } pkgInfo.versionName?.let { metaData[FileMetaType.AppVersion] = it } - pkgInfo.packageName?.let { metaData[FileMetaType.AppPackageName] = it } - metaData[FileMetaType.AppMinSdk] = - pkgInfo.applicationInfo.minSdkVersion.toString() + pkgInfo.packageName.let { metaData[FileMetaType.AppPackageName] = it } + pkgInfo.applicationInfo?.minSdkVersion?.toString()?.let { + metaData[FileMetaType.AppMinSdk] = it + } } } return metaData.toImmutableMap() diff --git a/data/weather/src/main/java/de/mm20/launcher2/weather/metno/MetNoProvider.kt b/data/weather/src/main/java/de/mm20/launcher2/weather/metno/MetNoProvider.kt index f041c48b..8bfd59a7 100644 --- a/data/weather/src/main/java/de/mm20/launcher2/weather/metno/MetNoProvider.kt +++ b/data/weather/src/main/java/de/mm20/launcher2/weather/metno/MetNoProvider.kt @@ -167,13 +167,13 @@ internal class MetNoProvider( context.packageName, PackageManager.GET_SIGNING_CERTIFICATES ) - pi.signingInfo.apkContentsSigners.firstOrNull() + pi.signingInfo?.apkContentsSigners?.firstOrNull() } else { val pi = context.packageManager.getPackageInfo( context.packageName, PackageManager.GET_SIGNATURES ) - pi.signatures.firstOrNull() + pi.signatures?.firstOrNull() } val signatureHash = if (signature != null) { val digest = MessageDigest.getInstance("SHA") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d45bc377..c0a94615 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ guava = "33.1.0-android" jacksonCore = "2.12.7" jacksonDataformatYaml = "2.12.7" minSdk = "26" -compileSdk = "34" +compileSdk = "35" targetSdk = "35" pluginSdk = "2.0.1" diff --git a/services/backup/src/main/java/de/mm20/launcher2/backup/BackupManager.kt b/services/backup/src/main/java/de/mm20/launcher2/backup/BackupManager.kt index 57e698a8..43739679 100644 --- a/services/backup/src/main/java/de/mm20/launcher2/backup/BackupManager.kt +++ b/services/backup/src/main/java/de/mm20/launcher2/backup/BackupManager.kt @@ -28,7 +28,7 @@ class BackupManager( val packageInfo = context.packageManager.getPackageInfo(context.packageName, 0) val meta = BackupMetadata( - appVersionName = packageInfo.versionName, + appVersionName = packageInfo.versionName ?: "", timestamp = System.currentTimeMillis(), deviceName = Build.MODEL, format = BackupFormat, diff --git a/services/icons/src/main/java/de/mm20/launcher2/icons/IconPack.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/IconPack.kt index d5b40a8a..a90cd314 100644 --- a/services/icons/src/main/java/de/mm20/launcher2/icons/IconPack.kt +++ b/services/icons/src/main/java/de/mm20/launcher2/icons/IconPack.kt @@ -39,7 +39,7 @@ data class IconPack( packageInfo: PackageInfo, themed: Boolean = false ) : this( - name = packageInfo.applicationInfo.loadLabel(context.packageManager).toString(), + name = packageInfo.applicationInfo!!.loadLabel(context.packageManager).toString(), packageName = packageInfo.packageName, version = context.packageManager.getPackageInfo(packageInfo.packageName, 0).let { "${it.versionName} (${it.versionCode})" diff --git a/services/music/src/main/java/de/mm20/launcher2/music/MusicService.kt b/services/music/src/main/java/de/mm20/launcher2/music/MusicService.kt index 1aee1535..fb67b312 100644 --- a/services/music/src/main/java/de/mm20/launcher2/music/MusicService.kt +++ b/services/music/src/main/java/de/mm20/launcher2/music/MusicService.kt @@ -432,7 +432,7 @@ internal class MusicServiceImpl( return try { context .packageManager - .getPackageInfo(packageName, 0).applicationInfo + .getPackageInfo(packageName, 0).applicationInfo!! .loadLabel(context.packageManager).toString() } catch (e: PackageManager.NameNotFoundException) { null diff --git a/services/plugins/src/main/java/de/mm20/launcher2/plugins/PluginService.kt b/services/plugins/src/main/java/de/mm20/launcher2/plugins/PluginService.kt index b8cbcd4b..46e0fc76 100644 --- a/services/plugins/src/main/java/de/mm20/launcher2/plugins/PluginService.kt +++ b/services/plugins/src/main/java/de/mm20/launcher2/plugins/PluginService.kt @@ -289,13 +289,13 @@ internal class PluginServiceImpl( packageName, PackageManager.GET_SIGNING_CERTIFICATES ) - pi.signingInfo.apkContentsSigners.firstOrNull() + pi.signingInfo?.apkContentsSigners?.firstOrNull() } else { val pi = context.packageManager.getPackageInfo( packageName, PackageManager.GET_SIGNATURES ) - pi.signatures.firstOrNull() + pi.signatures?.firstOrNull() } return if (signature != null) { val digest = MessageDigest.getInstance("SHA")