From 85224c368d6a6886b7eb0794b4c40671973daba0 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 19 Feb 2023 16:44:58 -0500 Subject: [PATCH] Avoid crash when loading invalid extension package (cherry picked from commit 3d7c136320da3b5842a51d7dbb9e82cf74144f3f) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt --- .../extension/util/ExtensionLoader.kt | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt index c3a1c284d..41eb2e0f6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt @@ -4,6 +4,7 @@ import android.annotation.SuppressLint import android.content.Context import android.content.pm.PackageInfo import android.content.pm.PackageManager +import android.os.Build import androidx.core.content.pm.PackageInfoCompat import dalvik.system.PathClassLoader import eu.kanade.domain.source.service.SourcePreferences @@ -57,7 +58,14 @@ internal object ExtensionLoader { */ fun loadExtensions(context: Context): List { val pkgManager = context.packageManager - val installedPkgs = pkgManager.getInstalledPackages(PACKAGE_FLAGS) + + @Suppress("DEPRECATION") + val installedPkgs = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + pkgManager.getInstalledPackages(PackageManager.PackageInfoFlags.of(PACKAGE_FLAGS.toLong())) + } else { + pkgManager.getInstalledPackages(PACKAGE_FLAGS) + } + val extPkgs = installedPkgs.filter { isPackageAnExtension(it) } if (extPkgs.isEmpty()) return emptyList() @@ -113,24 +121,21 @@ internal object ExtensionLoader { val versionCode = PackageInfoCompat.getLongVersionCode(pkgInfo) if (versionName.isNullOrEmpty()) { - val exception = Exception("Missing versionName for extension $extName") - logcat(LogPriority.WARN, exception) + logcat(LogPriority.WARN) { "Missing versionName for extension $extName" } return LoadResult.Error } // Validate lib version - val libVersion = versionName.substringBeforeLast('.').toDouble() - if (libVersion < LIB_VERSION_MIN || libVersion > LIB_VERSION_MAX) { - val exception = Exception( + val libVersion = versionName.substringBeforeLast('.').toDoubleOrNull() + if (libVersion == null || libVersion < LIB_VERSION_MIN || libVersion > LIB_VERSION_MAX) { + logcat(LogPriority.WARN) { "Lib version is $libVersion, while only versions " + - "$LIB_VERSION_MIN to $LIB_VERSION_MAX are allowed", - ) - logcat(LogPriority.WARN, exception) + "$LIB_VERSION_MIN to $LIB_VERSION_MAX are allowed" + } return LoadResult.Error } val signatureHash = getSignatureHash(pkgInfo) - if (signatureHash == null) { logcat(LogPriority.WARN) { "Package $pkgName isn't signed" } return LoadResult.Error