Handling tabs in pageFragment

Author: cooltey

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

@@ -409,11 +409,14 @@ class PageActivity : BaseActivity(), PageFragment.Callback, LinkPreviewDialog.Lo
         removeTransitionAnimState()
         maybeShowThemeTooltip()
         runBlocking {
+            L.d("onPageLoadComplete " + pageFragment.currentTab.id)
+            L.d("onPageLoadComplete size " + pageFragment.currentTab.backStack.size)
             if (pageFragment.currentTab.id != 0L) {
                 TabHelper.updateTab(pageFragment.currentTab)
             } else {
                 TabHelper.insertTabs(listOf(pageFragment.currentTab))
             }
+            pageFragment.setTab(TabHelper.getCurrentTab())
         }
     }
 
@@ -639,6 +642,7 @@ class PageActivity : BaseActivity(), PageFragment.Callback, LinkPreviewDialog.Lo
     }
 
     private fun loadFilePageFromBackStackIfNeeded() {
+        pageFragment.initTab()
         if (pageFragment.currentTab.backStack.isNotEmpty()) {
             val item = pageFragment.currentTab.backStack[pageFragment.currentTab.backStackPosition]
             loadNonArticlePageIfNeeded(item.getPageTitle())

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

@@ -199,6 +199,7 @@ class PageFragment : Fragment(), BackPressedHandler, CommunicationBridge.Communi
         _binding = FragmentPageBinding.inflate(inflater, container, false)
         webView = binding.pageWebView
         initWebViewListeners()
+        initTab()
         binding.pageRefreshContainer.scrollableChild = webView
         binding.pageRefreshContainer.setOnRefreshListener(pageRefreshListener)
         val swipeOffset = DimenUtil.getContentTopOffsetPx(requireActivity()) + REFRESH_SPINNER_ADDITIONAL_OFFSET
@@ -242,11 +243,6 @@ class PageFragment : Fragment(), BackPressedHandler, CommunicationBridge.Communi
             }
         }
 
-        // TODO: use coroutines if we have viewModel
-        runBlocking {
-            currentTab = TabHelper.getCurrentTab()
-        }
-
         editHandler = EditHandler(this, bridge)
         sidePanelHandler = SidePanelHandler(this, bridge)
         leadImagesHandler = LeadImagesHandler(this, webView, binding.pageHeaderView, callback())
@@ -526,6 +522,18 @@ class PageFragment : Fragment(), BackPressedHandler, CommunicationBridge.Communi
         }
     }
 
+    fun initTab() {
+        // TODO: use coroutines if we have viewModel
+        runBlocking {
+            currentTab = TabHelper.getCurrentTab()
+        }
+    }
+
+    fun setTab(tab: Tab) {
+        currentTab = tab
+        pageFragmentLoadState.setTab(tab)
+    }
+
     private fun openInNewTab(title: PageTitle, entry: HistoryEntry, toForeground: Boolean) {
         val selectedTab = TabHelper.findTabByTitle(title)
         if (selectedTab != null) {
@@ -930,6 +938,9 @@ class PageFragment : Fragment(), BackPressedHandler, CommunicationBridge.Communi
         // handler), since the page metadata might have altered the lead image display state.
         bridge.execute(JavaScriptActionHandler.setTopMargin(leadImagesHandler.topMargin))
         bridge.execute(JavaScriptActionHandler.setFooter(model))
+
+        // Update the currentTab from the pageLoadState
+        currentTab = pageFragmentLoadState.getCurrentTab()
     }
 
     fun openInNewBackgroundTab(title: PageTitle, entry: HistoryEntry) {

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

@@ -79,6 +79,10 @@ class PageFragmentLoadState(private var model: PageViewModel,
         return isDifferent
     }
 
+    fun getCurrentTab(): Tab {
+        return currentTab
+    }
+
     fun goBack(): Boolean {
         if (currentTab.canGoBack()) {
             currentTab.moveBack()

app/src/main/java/org/wikipedia/page/tabs/TabHelper.kt

@@ -33,12 +33,11 @@ object TabHelper {
         count = tabs.size
     }
 
-    fun getCurrentTab(): Tab {
-        // TODO: handle this with coroutines if we have viewModel
-        return runBlocking {
+    suspend fun getCurrentTab(): Tab {
+        return withContext(Dispatchers.IO) {
             val foregroundTab = AppDatabase.instance.tabDao().getForegroundTab()
             if (foregroundTab == null) {
-                return@runBlocking Tab()
+                return@withContext Tab()
             }
             // Use the backStackIds to get the full backStack items from the database
             val backStackItems = AppDatabase.instance.pageBackStackItemDao()
@@ -173,10 +172,12 @@ object TabHelper {
             // Find the existing tab in the database
             val existingTab = AppDatabase.instance.tabDao().getTabById(tab.id)
             if (existingTab != null) {
+                L.d("onPageLoadComplete existingTab " + existingTab.id)
                 // First, find removed backstack items
                 val removedBackStacks =
-                    existingTab.getBackStackIds().subtract(tab.getBackStackIds()).filter { it != -1L }
+                    existingTab.getBackStackIds().subtract(tab.getBackStackIds()).filter { it != 0L }
                 if (removedBackStacks.isNotEmpty()) {
+                    L.d("onPageLoadComplete removedBackStacks")
                     // Delete removed backstack items from the database
                     AppDatabase.instance.pageBackStackItemDao()
                         .deletePageBackStackItemsById(removedBackStacks.toList())
@@ -186,7 +187,8 @@ object TabHelper {
                 val backStackIds = mutableListOf<Long>()
                 tab.backStack.forEach { item ->
                     var backStackId = item.id
-                    if (item.id == -1L) {
+                    L.d("onPageLoadComplete backStack $backStackId")
+                    if (item.id == 0L) {
                         val newId = AppDatabase.instance.pageBackStackItemDao()
                             .insertPageBackStackItem(item)
                         backStackId = newId
@@ -195,6 +197,7 @@ object TabHelper {
                 }
 
                 // Finally, update the tab with the new backStackIds and order
+                L.d("onPageLoadComplete $backStackIds")
                 tab.setBackStackIds(backStackIds)
                 AppDatabase.instance.tabDao().updateTab(tab)
                 updateTabCount()