From 956b3284d382a150da0dd2866dc0f9fca67d48c7 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Fri, 1 May 2020 09:38:35 -0400
Subject: [PATCH] Always update extensions list on enter

---
 .../ui/browse/extension/ExtensionController.kt         | 10 ++--------
 1 file changed, 2 insertions(+), 8 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 a5e343906c..cfb58626d8 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
@@ -10,8 +10,6 @@ import androidx.appcompat.widget.SearchView
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.bluelinelabs.conductor.ControllerChangeHandler
 import com.bluelinelabs.conductor.ControllerChangeType
-import com.bluelinelabs.conductor.RouterTransaction
-import com.bluelinelabs.conductor.changehandler.FadeChangeHandler
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.kanade.tachiyomi.R
@@ -90,9 +88,7 @@ open class ExtensionController :
             R.id.action_search -> expandActionViewFromInteraction = true
             R.id.action_settings -> {
                 (parentController as BrowseController).pushController(
-                    (RouterTransaction.with(ExtensionFilterController()))
-                        .popChangeHandler(SettingsExtensionsFadeChangeHandler())
-                        .pushChangeHandler(FadeChangeHandler())
+                    ExtensionFilterController().withFadeTransaction()
                 )
             }
             else -> return super.onOptionsItemSelected(item)
@@ -102,7 +98,7 @@ open class ExtensionController :
 
     override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) {
         super.onChangeStarted(handler, type)
-        if (!type.isPush && handler is SettingsExtensionsFadeChangeHandler) {
+        if (type.isPush) {
             presenter.findAvailableExtensions()
         }
     }
@@ -211,6 +207,4 @@ open class ExtensionController :
     override fun uninstallExtension(pkgName: String) {
         presenter.uninstallExtension(pkgName)
     }
-
-    class SettingsExtensionsFadeChangeHandler : FadeChangeHandler()
 }