Merge branch 'hotfix/5.208.1'

Author: anikiki

app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt

@@ -830,7 +830,6 @@ class BrowserTabFragment :
         configureOmnibarTextInput()
         configureFindInPage()
         configureAutoComplete()
-        configureFocusedView()
         configureNewTab()
         initPrivacyProtectionsPopup()
 
@@ -2128,18 +2127,6 @@ class BrowserTabFragment :
         binding.autoCompleteSuggestionsList.adapter = autoCompleteSuggestionsAdapter
     }
 
-    private fun configureFocusedView() {
-        focusedViewProvider.provideFocusedViewVersion().onEach { focusedView ->
-            binding.focusedViewContainerLayout.addView(
-                focusedView.getView(requireContext()),
-                LayoutParams(
-                    LayoutParams.MATCH_PARENT,
-                    LayoutParams.MATCH_PARENT,
-                ),
-            )
-        }.launchIn(lifecycleScope)
-    }
-
     private fun configureNewTab() {
         newBrowserTab.newTabLayout.setOnScrollChangeListener { v, scrollX, scrollY, oldScrollX, oldScrollY ->
             if (omnibar.omniBarContainer.isPressed) {
@@ -3563,20 +3550,43 @@ class BrowserTabFragment :
                 // viewState.showFavourites needs to be moved to FocusedViewModel
                 if (viewState.showSuggestions || viewState.showFavorites) {
                     if (viewState.favorites.isNotEmpty() && viewState.showFavorites) {
+                        showFocusedView()
                         binding.autoCompleteSuggestionsList.gone()
-                        binding.focusedViewContainerLayout.show()
                     } else {
                         binding.autoCompleteSuggestionsList.show()
-                        binding.focusedViewContainerLayout.gone()
                         autoCompleteSuggestionsAdapter.updateData(viewState.searchResults.query, viewState.searchResults.suggestions)
+                        hideFocusedView()
                     }
                 } else {
                     binding.autoCompleteSuggestionsList.gone()
-                    binding.focusedViewContainerLayout.gone()
+                    hideFocusedView()
                 }
             }
         }
 
+        private fun showFocusedView() {
+            binding.focusedViewContainerLayout.show()
+            configureFocusedView()
+        }
+
+        private fun configureFocusedView() {
+            if (binding.focusedViewContainerLayout.childCount == 0) {
+                focusedViewProvider.provideFocusedViewVersion().onEach { focusedView ->
+                    binding.focusedViewContainerLayout.addView(
+                        focusedView.getView(requireContext()),
+                        LayoutParams(
+                            LayoutParams.MATCH_PARENT,
+                            LayoutParams.MATCH_PARENT,
+                        ),
+                    )
+                }.launchIn(lifecycleScope)
+            }
+        }
+
+        private fun hideFocusedView() {
+            binding.focusedViewContainerLayout.gone()
+        }
+
         fun renderOmnibar(viewState: OmnibarViewState) {
             renderIfChanged(viewState, lastSeenOmnibarViewState) {
                 lastSeenOmnibarViewState = viewState

app/src/main/res/layout/fragment_browser_tab.xml

@@ -51,6 +51,7 @@
         android:id="@+id/focusedViewContainerLayout"
         android:clipToPadding="false"
         android:elevation="4dp"
+        android:background="?attr/daxColorSurface"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />

app/version/release-notes

@@ -1 +1,5 @@
-Bug fixes and other improvements
+Added the ability to import passwords from the desktop version of the browser via Sync & Backup.
+
+For Privacy Pro subscribers:
+Fixed an issue that prevented some users from connecting to a U.S. server location.
+Privacy Pro is currently available to U.S. residents only.

app/version/version.properties

@@ -1 +1 @@
-VERSION=5.208.0
+VERSION=5.208.1