From e3610cbe2c8fe73dd30dfcec888eee977016c1eb Mon Sep 17 00:00:00 2001 From: AntsyLich <59261191+AntsyLich@users.noreply.github.com> Date: Tue, 16 Jun 2026 00:12:01 +0600 Subject: [PATCH] Allow app to load TachiyomiX 1.6 extensions --- .../tachiyomi/extension/util/ExtensionLoader.kt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 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 90d9d1598..3d260cdb5 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 @@ -50,7 +50,7 @@ internal object ExtensionLoader { private const val METADATA_SOURCE_FACTORY = "tachiyomi.extension.factory" private const val METADATA_NSFW = "tachiyomi.extension.nsfw" const val LIB_VERSION_MIN = 1.4 - const val LIB_VERSION_MAX = 1.5 + const val LIB_VERSION_MAX = 1.6 @Suppress("DEPRECATION") private val PACKAGE_FLAGS = PackageManager.GET_CONFIGURATIONS or @@ -209,7 +209,7 @@ internal object ExtensionLoader { isShared = true, ) } - } catch (error: PackageManager.NameNotFoundException) { + } catch (_: PackageManager.NameNotFoundException) { null } @@ -239,13 +239,20 @@ internal object ExtensionLoader { // Validate lib version val libVersion = versionName.substringBeforeLast('.').toDoubleOrNull() - if (libVersion == null || libVersion < LIB_VERSION_MIN || libVersion > LIB_VERSION_MAX) { + 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" + "$LIB_VERSION_MIN and $LIB_VERSION_MAX is allowed" } return LoadResult.Error } +// if (libVersion == null || libVersion < LIB_VERSION_MIN || libVersion > LIB_VERSION_MAX) { +// logcat(LogPriority.WARN) { +// "Lib version is $libVersion, while only versions " + +// "$LIB_VERSION_MIN or $LIB_VERSION_MAX is allowed" +// } +// return LoadResult.Error +// } val signatures = getSignatures(pkgInfo) if (signatures.isNullOrEmpty()) {