Fix errors

Author: cooltey

app/src/main/java/org/wikipedia/WikipediaApp.kt

@@ -11,7 +11,6 @@ import androidx.appcompat.app.AppCompatDelegate
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import org.wikipedia.analytics.eventplatform.AppSessionEvent
 import org.wikipedia.analytics.eventplatform.EventPlatformClient
 import org.wikipedia.appshortcuts.AppShortcuts
@@ -30,7 +29,6 @@ import org.wikipedia.language.AcceptLanguageUtil
 import org.wikipedia.language.AppLanguageState
 import org.wikipedia.notifications.NotificationCategory
 import org.wikipedia.notifications.NotificationPollBroadcastReceiver
-import org.wikipedia.page.tabs.TabHelper
 import org.wikipedia.push.WikipediaFirebaseMessagingService
 import org.wikipedia.settings.Prefs
 import org.wikipedia.theme.Theme
@@ -140,11 +138,6 @@ class WikipediaApp : Application() {
 
         setupLeakCanary()
 
-        // Initialize the tabs with runBlocking to ensure that the tabs are ready before showing the TabCountView.
-        runBlocking {
-            TabHelper.initTabs()
-        }
-
         // See Javadocs and http://developer.android.com/tools/support-library/index.html#rev23-4-0
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
 

app/src/main/java/org/wikipedia/page/PageFragmentLoadState.kt

@@ -24,7 +24,6 @@ import org.wikipedia.notifications.AnonymousNotificationHelper
 import org.wikipedia.page.leadimages.LeadImagesHandler
 import org.wikipedia.page.tabs.PageBackStackItem
 import org.wikipedia.page.tabs.Tab
-import org.wikipedia.page.tabs.TabHelper
 import org.wikipedia.settings.Prefs
 import org.wikipedia.staticdata.UserTalkAliasData
 import org.wikipedia.util.DateUtil
@@ -259,7 +258,7 @@ class PageFragmentLoadState(private var model: PageViewModel,
             fragment.requireActivity().invalidateOptionsMenu()
 
             // Update our tab list to prevent ZH variants issue.
-            TabHelper.list.getOrNull(TabHelper.count - 1)?.setBackStackPositionTitle(title)
+            currentTab.setBackStackPositionTitle(title)
 
             // Update our history entry, in case the Title was changed (i.e. normalized)
             model.curEntry?.let {

app/src/main/java/org/wikipedia/search/SearchResultsViewModel.kt

@@ -20,7 +20,6 @@ import org.wikipedia.database.AppDatabase
 import org.wikipedia.dataclient.ServiceFactory
 import org.wikipedia.dataclient.WikiSite
 import org.wikipedia.dataclient.mwapi.MwQueryResponse
-import org.wikipedia.page.tabs.TabHelper
 import org.wikipedia.util.StringUtil
 
 class SearchResultsViewModel : ViewModel() {
@@ -126,15 +125,26 @@ class SearchResultsViewModel : ViewModel() {
             return null
         }
 
-        private fun getSearchResultsFromTabs(wikiSite: WikiSite, searchTerm: String): SearchResults {
-            TabHelper.list.forEach { tab ->
-                tab.getBackStackPositionTitle()?.let {
-                    if (wikiSite == it.wikiSite && StringUtil.fromHtml(it.displayText).contains(searchTerm, true)) {
-                        return SearchResults(mutableListOf(SearchResult(it, SearchResult.SearchResultType.TAB_LIST)))
-                    }
+        private suspend fun getSearchResultsFromTabs(wikiSite: WikiSite, searchTerm: String): SearchResults {
+            return withContext(Dispatchers.IO) {
+                val tabs = AppDatabase.instance.tabDao().getTabs()
+                tabs.forEach { tab ->
+                    // Use the backStackIds to get the full backStack items from the database
+                    val backStackItems = AppDatabase.instance.pageBackStackItemDao()
+                        .getPageBackStackItems(tab.getBackStackIds())
+                    tab.backStack = backStackItems.toMutableList()
+                }
+                return@withContext tabs.firstOrNull {
+                    it.getBackStackPositionTitle()?.let { title ->
+                        title.wikiSite == wikiSite && StringUtil.fromHtml(title.displayText).contains(searchTerm, true)
+                    } ?: false
+                }?.let { tab ->
+                    SearchResults(mutableListOf(SearchResult(tab.getBackStackPositionTitle()!!, SearchResult.SearchResultType.TAB_LIST)))
+                } ?: run {
+                    SearchResults()
                 }
             }
-            return SearchResults()
+
         }
     }
 }