From f07fbcc196038e7a01b3a82ed704d008e6b61910 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Fri, 1 May 2020 19:17:37 -0400
Subject: [PATCH] Relay extension changes to sources controller (fixes #3002)

---
 .../java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt  | 3 +++
 .../tachiyomi/ui/browse/extension/ExtensionController.kt    | 4 +++-
 .../kanade/tachiyomi/ui/browse/source/SourceController.kt   | 6 ++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt
index b5b5769a53..f3245cc830 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt
@@ -12,6 +12,7 @@ import com.bluelinelabs.conductor.RouterTransaction
 import com.bluelinelabs.conductor.support.RouterPagerAdapter
 import com.google.android.material.badge.BadgeDrawable
 import com.google.android.material.tabs.TabLayout
+import com.jakewharton.rxrelay.PublishRelay
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.databinding.PagerControllerBinding
@@ -41,6 +42,8 @@ class BrowseController :
 
     private val toExtensions = args.getBoolean(TO_EXTENSIONS_EXTRA, false)
 
+    val extensionListUpdateRelay: PublishRelay<Boolean> = PublishRelay.create()
+
     private var adapter: BrowseAdapter? = null
 
     override fun getTitle(): String? {
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 cfb58626d8..c1ac6ef600 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
@@ -181,7 +181,9 @@ open class ExtensionController :
         drawExtensions()
 
         // Update badge on parent controller tab
-        (parentController as BrowseController).setExtensionUpdateBadge()
+        val ctrl = parentController as BrowseController
+        ctrl.setExtensionUpdateBadge()
+        ctrl.extensionListUpdateRelay.call(true)
     }
 
     private fun drawExtensions() {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
index 1fff317822..a2632b469a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
@@ -92,6 +92,12 @@ class SourceController :
         adapter?.fastScroller = binding.fastScroller
 
         requestPermissionsSafe(arrayOf(WRITE_EXTERNAL_STORAGE), 301)
+
+        // Update list on extension changes (e.g. new installation)
+        (parentController as BrowseController).extensionListUpdateRelay
+            .subscribeUntilDestroy {
+                presenter.updateSources()
+            }
     }
 
     override fun onDestroyView(view: View) {