From dfa3bc2de7d2a010bc81b0a7f19395b373e31cf1 Mon Sep 17 00:00:00 2001 From: Christian Padilla Date: Tue, 9 Jul 2024 07:36:21 -0400 Subject: [PATCH] fix(package_info_plus): Address changed fields nullability on Android 15 (API 35) (#2975) Co-authored-by: Volodymyr Buberenko Co-authored-by: Miguel Beltran --- .../fluttercommunity/plus/packageinfo/PackageInfoPlugin.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/android/src/main/kotlin/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.kt b/packages/package_info_plus/package_info_plus/android/src/main/kotlin/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.kt index 4cbc084fbf..76bbe089b5 100644 --- a/packages/package_info_plus/package_info_plus/android/src/main/kotlin/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.kt +++ b/packages/package_info_plus/package_info_plus/android/src/main/kotlin/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.kt @@ -42,9 +42,9 @@ class PackageInfoPlugin : MethodCallHandler, FlutterPlugin { val infoMap = HashMap() infoMap.apply { - put("appName", info.applicationInfo.loadLabel(packageManager).toString()) + put("appName", info.applicationInfo?.loadLabel(packageManager)?.toString() ?: "") put("packageName", applicationContext!!.packageName) - put("version", info.versionName) + put("version", info.versionName ?: "") put("buildNumber", getLongVersionCode(info).toString()) if (buildSignature != null) put("buildSignature", buildSignature) if (installerPackage != null) put("installerStore", installerPackage) @@ -105,7 +105,7 @@ class PackageInfoPlugin : MethodCallHandler, FlutterPlugin { ) val signatures = packageInfo.signatures - if (signatures.isNullOrEmpty() || packageInfo.signatures.first() == null) { + if (signatures.isNullOrEmpty() || signatures.first() == null) { null } else { signatureToSha256(signatures.first().toByteArray())