From aa3ece66a9fbe5aa269a586f7241f7ffa24e68b5 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Wed, 17 Aug 2022 14:26:36 +0200
Subject: [PATCH] Cloned sites working Fixes #19

---
 .../lagradost/cloudstream3/MainActivity.kt    | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 1a6f3ef9..be1b0e82 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -452,6 +452,28 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             }
 
             PluginManager.loadAllLocalPlugins(this@MainActivity)
+
+            // Load cloned sites after plugins have been loaded since clones depend on plugins.
+            try {
+                getKey<Array<SettingsGeneral.CustomSite>>(USER_PROVIDER_API)?.let { list ->
+                    list.forEach { custom ->
+                        allProviders.firstOrNull { it.javaClass.simpleName == custom.parentJavaClass }
+                            ?.let {
+                                allProviders.add(it.javaClass.newInstance().apply {
+                                    name = custom.name
+                                    lang = custom.lang
+                                    mainUrl = custom.url.trimEnd('/')
+                                    canBeOverridden = false
+                                })
+                            }
+                    }
+                }
+                apis = allProviders.distinctBy { it }
+                APIHolder.apiMap = null
+            } catch (e: Exception) {
+                logError(e)
+            }
+
             afterPluginsLoadedEvent.invoke(true)
         }
 
@@ -488,26 +510,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             initAll()
             // No duplicates (which can happen by registerMainAPI)
             apis = allProviders.distinctBy { it }
-
-            try {
-                getKey<Array<SettingsGeneral.CustomSite>>(USER_PROVIDER_API)?.let { list ->
-                    list.forEach { custom ->
-                        allProviders.firstOrNull { it.javaClass.simpleName == custom.parentJavaClass }
-                            ?.let {
-                                allProviders.add(it.javaClass.newInstance().apply {
-                                    name = custom.name
-                                    lang = custom.lang
-                                    mainUrl = custom.url.trimEnd('/')
-                                    canBeOverridden = false
-                                })
-                            }
-                    }
-                }
-                apis = allProviders.distinctBy { it }
-                APIHolder.apiMap = null
-            } catch (e: Exception) {
-                logError(e)
-            }
         }
 
         //  val navView: BottomNavigationView = findViewById(R.id.nav_view)