From b74fb2ef5e4c85d91c0a629821be77b3aeaf75d0 Mon Sep 17 00:00:00 2001 From: Jay Date: Mon, 13 Jan 2020 18:30:20 -0800 Subject: [PATCH] Fixed extensions showing as obsolete when call fails (cherry picked from commit a44e9a19b0cfceeaeecd8ad378f14ccd47c8683c) --- .../kanade/tachiyomi/extension/ExtensionManager.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 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 bfb3381fa..742c94828 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt @@ -159,6 +159,10 @@ class ExtensionManager( * @param availableExtensions The list of extensions given by the [api]. */ private fun updatedInstalledExtensionsStatuses(availableExtensions: List) { + if (availableExtensions.isEmpty()) { + return + } + val mutInstalledExtensions = installedExtensions.toMutableList() var changed = false @@ -166,12 +170,10 @@ class ExtensionManager( val pkgName = installedExt.pkgName val availableExt = availableExtensions.find { it.pkgName == pkgName } - if (availableExt == null) { - if (!installedExt.isObsolete) { - mutInstalledExtensions[index] = installedExt.copy(isObsolete = true) - changed = true - } - } else { + if (availableExt == null && !installedExt.isObsolete) { + mutInstalledExtensions[index] = installedExt.copy(isObsolete = true) + changed = true + } else if (availableExt != null) { val hasUpdate = availableExt.versionCode > installedExt.versionCode if (installedExt.hasUpdate != hasUpdate) { mutInstalledExtensions[index] = installedExt.copy(hasUpdate = hasUpdate)