Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	app/build.gradle

Author: Stormunblessed

app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt

@@ -232,9 +232,8 @@ class HomeFragment : Fragment() {
                     currentValidApis.addAll(0, validAPIs.subList(0, 2))
 
                     val names = currentValidApis.map { if(isMultiLang) "${getFlagFromIso(it.lang)?.plus(" ") ?: ""}${it.name}" else it.name }
-                    val index = names.indexOf(currentApiName)
+                    val index = currentValidApis.map { it.name }.indexOf(currentApiName)
                     listView?.setItemChecked(index, true)
-                    arrayAdapter.notifyDataSetChanged()
                     arrayAdapter.addAll(names)
                     arrayAdapter.notifyDataSetChanged()
                 }

app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt

@@ -231,8 +231,7 @@ class SearchFragment : Fragment() {
                                 it.lang
                             )?.plus(" ") ?: ""
                         }${it.name}" else it.name }
-
-                        for ((index, api) in names.withIndex()) {
+                        for ((index, api) in currentValidApis.map { it.name }.withIndex()) {
                             listView?.setItemChecked(index, currentSelectedApis.contains(api))
                         }