From da611bfa7698e3092f2037d456aec8fe7696f15a Mon Sep 17 00:00:00 2001 From: AntsyLich <59261191+AntsyLich@users.noreply.github.com> Date: Sat, 27 Aug 2022 22:12:59 +0600 Subject: [PATCH] Prevent unofficial exts from getting marked as obsolete or updateable (#7871) * Prevent unofficial exts from getting marked as obsolete * Prevent unofficial ext `hasUpdate` getting marked as true (cherry picked from commit 8d40e20b7de49056940a6f07378778934724534a) --- .../main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt | 2 +- .../eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt index 6c738affa..89ab718a0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt @@ -226,7 +226,7 @@ class ExtensionManager( val availableExt = unalteredAvailableExtensions.find { it.pkgName == pkgName } // SY <-- - if (availableExt == null && !installedExt.isObsolete) { + if (!installedExt.isUnofficial && availableExt == null && !installedExt.isObsolete) { mutInstalledExtensions[index] = installedExt.copy(isObsolete = true) changed = true // SY --> diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt index 270906d69..4fa7df88a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt @@ -102,7 +102,7 @@ internal class ExtensionGithubApi { val pkgName = installedExt.pkgName val availableExt = extensions.find { it.pkgName == pkgName } ?: continue - val hasUpdate = availableExt.versionCode > installedExt.versionCode + val hasUpdate = installedExt.isUnofficial.not() && (availableExt.versionCode > installedExt.versionCode) if (hasUpdate) { extensionsWithUpdate.add(installedExt) }