Compile SDK 35

This commit is contained in:
MM20 2024-07-18 18:46:12 +02:00
parent cf398f66a0
commit 52150c5257
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
10 changed files with 21 additions and 18 deletions

View File

@ -29,13 +29,13 @@ fun BuildInfoSettingsScreen() {
context.packageName, context.packageName,
PackageManager.GET_SIGNING_CERTIFICATES PackageManager.GET_SIGNING_CERTIFICATES
) )
pi.signingInfo.apkContentsSigners.firstOrNull() pi.signingInfo?.apkContentsSigners?.firstOrNull()
} else { } else {
val pi = context.packageManager.getPackageInfo( val pi = context.packageManager.getPackageInfo(
context.packageName, context.packageName,
PackageManager.GET_SIGNATURES PackageManager.GET_SIGNATURES
) )
pi.signatures.firstOrNull() pi.signatures?.firstOrNull()
} }
val signatureHash = if (signature != null) { val signatureHash = if (signature != null) {
val digest = MessageDigest.getInstance("SHA") val digest = MessageDigest.getInstance("SHA")

View File

@ -30,7 +30,7 @@ class BadgeDrawable(context: Context, drawable: Drawable) : Drawable() {
} }
val bitmap = drw.toBitmap(size, size).run { val bitmap = drw.toBitmap(size, size).run {
if(isMutable) this if(isMutable) this
else this.copy(config, true) else this.copy(config ?: Bitmap.Config.ARGB_8888, true)
} }
this.drawable = BitmapDrawable(context.resources, bitmap) this.drawable = BitmapDrawable(context.resources, bitmap)
} }

View File

@ -12,13 +12,13 @@ internal fun getAppSignature(context: Context): String {
context.packageName, context.packageName,
PackageManager.GET_SIGNING_CERTIFICATES PackageManager.GET_SIGNING_CERTIFICATES
) )
pi.signingInfo.apkContentsSigners.firstOrNull() pi.signingInfo?.apkContentsSigners?.firstOrNull()
} else { } else {
val pi = context.packageManager.getPackageInfo( val pi = context.packageManager.getPackageInfo(
context.packageName, context.packageName,
PackageManager.GET_SIGNATURES PackageManager.GET_SIGNATURES
) )
pi.signatures.firstOrNull() pi.signatures?.firstOrNull()
} }
return if (signature != null) { return if (signature != null) {
val digest = MessageDigest.getInstance("SHA") val digest = MessageDigest.getInstance("SHA")

View File

@ -357,12 +357,15 @@ internal data class LocalFile(
mimeType == "application/vnd.android.package-archive" -> { mimeType == "application/vnd.android.package-archive" -> {
val pkgInfo = context.packageManager.getPackageArchiveInfo(path, 0) val pkgInfo = context.packageManager.getPackageArchiveInfo(path, 0)
?: return metaData.toImmutableMap() ?: 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.versionName?.let { metaData[FileMetaType.AppVersion] = it }
pkgInfo.packageName?.let { metaData[FileMetaType.AppPackageName] = it } pkgInfo.packageName.let { metaData[FileMetaType.AppPackageName] = it }
metaData[FileMetaType.AppMinSdk] = pkgInfo.applicationInfo?.minSdkVersion?.toString()?.let {
pkgInfo.applicationInfo.minSdkVersion.toString() metaData[FileMetaType.AppMinSdk] = it
}
} }
} }
return metaData.toImmutableMap() return metaData.toImmutableMap()

View File

@ -167,13 +167,13 @@ internal class MetNoProvider(
context.packageName, context.packageName,
PackageManager.GET_SIGNING_CERTIFICATES PackageManager.GET_SIGNING_CERTIFICATES
) )
pi.signingInfo.apkContentsSigners.firstOrNull() pi.signingInfo?.apkContentsSigners?.firstOrNull()
} else { } else {
val pi = context.packageManager.getPackageInfo( val pi = context.packageManager.getPackageInfo(
context.packageName, context.packageName,
PackageManager.GET_SIGNATURES PackageManager.GET_SIGNATURES
) )
pi.signatures.firstOrNull() pi.signatures?.firstOrNull()
} }
val signatureHash = if (signature != null) { val signatureHash = if (signature != null) {
val digest = MessageDigest.getInstance("SHA") val digest = MessageDigest.getInstance("SHA")

View File

@ -4,7 +4,7 @@ guava = "33.1.0-android"
jacksonCore = "2.12.7" jacksonCore = "2.12.7"
jacksonDataformatYaml = "2.12.7" jacksonDataformatYaml = "2.12.7"
minSdk = "26" minSdk = "26"
compileSdk = "34" compileSdk = "35"
targetSdk = "35" targetSdk = "35"
pluginSdk = "2.0.1" pluginSdk = "2.0.1"

View File

@ -28,7 +28,7 @@ class BackupManager(
val packageInfo = context.packageManager.getPackageInfo(context.packageName, 0) val packageInfo = context.packageManager.getPackageInfo(context.packageName, 0)
val meta = BackupMetadata( val meta = BackupMetadata(
appVersionName = packageInfo.versionName, appVersionName = packageInfo.versionName ?: "",
timestamp = System.currentTimeMillis(), timestamp = System.currentTimeMillis(),
deviceName = Build.MODEL, deviceName = Build.MODEL,
format = BackupFormat, format = BackupFormat,

View File

@ -39,7 +39,7 @@ data class IconPack(
packageInfo: PackageInfo, packageInfo: PackageInfo,
themed: Boolean = false themed: Boolean = false
) : this( ) : this(
name = packageInfo.applicationInfo.loadLabel(context.packageManager).toString(), name = packageInfo.applicationInfo!!.loadLabel(context.packageManager).toString(),
packageName = packageInfo.packageName, packageName = packageInfo.packageName,
version = context.packageManager.getPackageInfo(packageInfo.packageName, 0).let { version = context.packageManager.getPackageInfo(packageInfo.packageName, 0).let {
"${it.versionName} (${it.versionCode})" "${it.versionName} (${it.versionCode})"

View File

@ -432,7 +432,7 @@ internal class MusicServiceImpl(
return try { return try {
context context
.packageManager .packageManager
.getPackageInfo(packageName, 0).applicationInfo .getPackageInfo(packageName, 0).applicationInfo!!
.loadLabel(context.packageManager).toString() .loadLabel(context.packageManager).toString()
} catch (e: PackageManager.NameNotFoundException) { } catch (e: PackageManager.NameNotFoundException) {
null null

View File

@ -289,13 +289,13 @@ internal class PluginServiceImpl(
packageName, packageName,
PackageManager.GET_SIGNING_CERTIFICATES PackageManager.GET_SIGNING_CERTIFICATES
) )
pi.signingInfo.apkContentsSigners.firstOrNull() pi.signingInfo?.apkContentsSigners?.firstOrNull()
} else { } else {
val pi = context.packageManager.getPackageInfo( val pi = context.packageManager.getPackageInfo(
packageName, packageName,
PackageManager.GET_SIGNATURES PackageManager.GET_SIGNATURES
) )
pi.signatures.firstOrNull() pi.signatures?.firstOrNull()
} }
return if (signature != null) { return if (signature != null) {
val digest = MessageDigest.getInstance("SHA") val digest = MessageDigest.getInstance("SHA")