From a63cecbfcbd516bfcf4d12df9c185837ba1a17e2 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 20 Mar 2021 10:10:58 -0400 Subject: [PATCH] Make tapping available extension row prompt install --- .../ui/browse/extension/ExtensionController.kt | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt index 6dbb31f683..bd44116bb8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt @@ -104,6 +104,8 @@ open class ExtensionController : override fun onButtonClick(position: Int) { val extension = (adapter?.getItem(position) as? ExtensionItem)?.extension ?: return when (extension) { + is Extension.Available -> presenter.installExtension(extension) + is Extension.Untrusted -> openTrustDialog(extension) is Extension.Installed -> { if (!extension.hasUpdate) { openDetails(extension) @@ -111,12 +113,6 @@ open class ExtensionController : presenter.updateExtension(extension) } } - is Extension.Available -> { - presenter.installExtension(extension) - } - is Extension.Untrusted -> { - openTrustDialog(extension) - } } } @@ -147,12 +143,11 @@ open class ExtensionController : override fun onItemClick(view: View, position: Int): Boolean { val extension = (adapter?.getItem(position) as? ExtensionItem)?.extension ?: return false - if (extension is Extension.Installed) { - openDetails(extension) - } else if (extension is Extension.Untrusted) { - openTrustDialog(extension) + when (extension) { + is Extension.Available -> presenter.installExtension(extension) + is Extension.Untrusted -> openTrustDialog(extension) + is Extension.Installed -> openDetails(extension) } - return false }