Merge branch 'hotfix/5.270.2'

Author: joshliebe

app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherActivity.kt

@@ -384,19 +384,22 @@ class TabSwitcherActivity :
         lifecycleScope.launch {
             viewModel.viewState.flowWithLifecycle(lifecycle).collectLatest {
                 tabsRecycler.invalidateItemDecorations()
-                tabsAdapter.updateData(it.tabSwitcherItems)
+
+                val shouldScroll = firstTimeLoadingTabsList && it.tabs.isNotEmpty()
+
+                tabsAdapter.updateData(it.tabSwitcherItems) {
+                    if (shouldScroll) {
+                        firstTimeLoadingTabsList = false
+                        scrollToActiveTab()
+                    }
+                }
 
                 updateToolbarTitle(it.mode, it.tabs.size)
                 updateTabGridItemDecorator()
 
                 tabTouchHelper.mode = it.mode
 
                 invalidateOptionsMenu()
-
-                if (firstTimeLoadingTabsList && it.tabs.isNotEmpty()) {
-                    firstTimeLoadingTabsList = false
-                    scrollToActiveTab()
-                }
             }
         }
 

app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt

@@ -467,8 +467,8 @@ class TabSwitcherAdapter(
         }
     }
 
-    fun updateData(updatedList: List<TabSwitcherItem>) {
-        differ.submitList(updatedList)
+    fun updateData(updatedList: List<TabSwitcherItem>, onDataUpdated: Runnable? = null) {
+        differ.submitList(updatedList, onDataUpdated)
     }
 
     fun getTabSwitcherItem(position: Int): TabSwitcherItem? = differ.currentList.getOrNull(position)

app/version/version.properties

@@ -1 +1 @@
-VERSION=5.270.1
+VERSION=5.270.2