Merge branch 'release/5.45.0'

cmonfortep · cmonfortep · commit 1a73d546efba · 2020-03-06T16:22:03.000+01:00
diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserChromeClientTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserChromeClientTest.kt
@@ -48,6 +48,12 @@ class BrowserChromeClientTest {
         webView = TestWebView(getInstrumentation().targetContext)
     }
 
+    @Test
+    fun whenWindowClosedThenCloseCurrentTab() {
+        testee.onCloseWindow(window = null)
+        verify(mockWebViewClientListener).closeCurrentTab()
+    }
+
     @Test
     fun whenCustomViewShownForFirstTimeListenerInstructedToGoFullScreen() {
         testee.onShowCustomView(fakeView, null)
diff --git a/app/src/androidTest/java/com/duckduckgo/app/statistics/VariantManagerTest.kt b/app/src/androidTest/java/com/duckduckgo/app/statistics/VariantManagerTest.kt
@@ -33,14 +33,14 @@ class VariantManagerTest {
     @Test
     fun serpControlVariantIsInactiveAndHasNoFeatures() {
         val variant = variants.first { it.key == "sc" }
-        assertEqualsDouble(0.0, variant.weight)
+        assertEqualsDouble(1.0, variant.weight)
         assertEquals(0, variant.features.size)
     }
 
     @Test
     fun serpExperimentalVariantIsInactiveAndHasNoFeatures() {
         val variant = variants.first { it.key == "se" }
-        assertEqualsDouble(0.0, variant.weight)
+        assertEqualsDouble(1.0, variant.weight)
         assertEquals(0, variant.features.size)
     }
 
diff --git a/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt
@@ -85,6 +85,18 @@ class SystemSearchViewModelTest {
         assertEquals(autocompleteQueryResult, newViewState?.autocompleteResults)
     }
 
+    @Test
+    fun whenUserAddsSpaceToQueryThenViewStateMatchesAndSpaceTrimmedFromAutocomplete() = ruleRunBlockingTest {
+        testee.userUpdatedQuery(QUERY)
+        testee.userUpdatedQuery("$QUERY ")
+
+        val newViewState = testee.viewState.value
+        assertNotNull(newViewState)
+        assertEquals("$QUERY ", newViewState?.queryText)
+        assertEquals(appQueryResult, newViewState?.appResults)
+        assertEquals(autocompleteQueryResult, newViewState?.autocompleteResults)
+    }
+
     @Test
     fun whenUserClearsQueryThenViewStateReset() = ruleRunBlockingTest {
         testee.userUpdatedQuery(QUERY)
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserChromeClient.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserChromeClient.kt
@@ -116,4 +116,8 @@ class BrowserChromeClient @Inject constructor(private val uncaughtExceptionRepos
         }
         return false
     }
+
+    override fun onCloseWindow(window: WebView?) {
+        webViewClientListener?.closeCurrentTab()
+    }
 }
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
@@ -379,13 +379,17 @@ class BrowserTabViewModel(
         return !currentBrowserViewState().browserShowing && navigation.hasNavigationHistory
     }
 
-    suspend fun closeCurrentTab() {
+    private suspend fun removeCurrentTabFromRepository() {
         val currentTab = tabRepository.liveSelectedTab.value
         currentTab?.let {
             tabRepository.delete(currentTab)
         }
     }
 
+    override fun closeCurrentTab() {
+        viewModelScope.launch { removeCurrentTabFromRepository() }
+    }
+
     fun onUserPressedForward() {
         if (!currentBrowserViewState().browserShowing) {
             browserViewState.value = currentBrowserViewState().copy(browserShowing = true)
@@ -1058,7 +1062,7 @@ class BrowserTabViewModel(
     }
 
     private fun recoverTabWithQuery(query: String) {
-        viewModelScope.launch { closeCurrentTab() }
+        closeCurrentTab()
         command.value = OpenInNewTab(query)
     }
 
diff --git a/app/src/main/java/com/duckduckgo/app/browser/WebViewClientListener.kt b/app/src/main/java/com/duckduckgo/app/browser/WebViewClientListener.kt
@@ -45,4 +45,5 @@ interface WebViewClientListener {
     fun openMessageInNewTab(message: Message)
     fun recoverFromRenderProcessGone()
     fun requiresAuthentication(request: BasicAuthenticationRequest)
+    fun closeCurrentTab()
 }
diff --git a/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt b/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
@@ -47,8 +47,8 @@ interface VariantManager {
         val ACTIVE_VARIANTS = listOf(
             // SERP variants. "sc" may also be used as a shared control for mobile experiments in
             // the future if we can filter by app version
-            Variant(key = "sc", weight = 0.0, features = emptyList(), filterBy = { noFilter() }),
-            Variant(key = "se", weight = 0.0, features = emptyList(), filterBy = { noFilter() }),
+            Variant(key = "sc", weight = 1.0, features = emptyList(), filterBy = { noFilter() }),
+            Variant(key = "se", weight = 1.0, features = emptyList(), filterBy = { noFilter() }),
 
             // Concept test experiment
             Variant(key = "mc", weight = 0.0, features = emptyList(), filterBy = { isEnglishLocale() }),
diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt
@@ -91,22 +91,21 @@ class SystemSearchViewModel(
 
         appsJob?.cancel()
 
-        val trimmedQuery = query.trim()
-
-        if (trimmedQuery == currentViewState().queryText) {
+        if (query == currentViewState().queryText) {
             return
         }
 
-        if (trimmedQuery.isBlank()) {
+        if (query.isBlank()) {
             userClearedQuery()
             return
         }
 
-        viewState.value = currentViewState().copy(queryText = trimmedQuery)
-        autoCompletePublishSubject.accept(trimmedQuery)
+        viewState.value = currentViewState().copy(queryText = query)
 
+        val trimmedQuery = query.trim()
+        autoCompletePublishSubject.accept(trimmedQuery)
         appsJob = viewModelScope.launch(dispatchers.io()) {
-            updateAppResults(deviceAppLookup.query(query))
+            updateAppResults(deviceAppLookup.query(trimmedQuery))
         }
     }
 
diff --git a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt
@@ -119,10 +119,15 @@ class TabSwitcherAdapter(private val itemClickListener: TabSwitcherListener, pri
     }
 
     private fun loadTabPreviewImage(tab: TabEntity, glide: GlideRequests, holder: TabViewHolder) {
-        val previewFile = tab.tabPreviewFile ?: return
+        val previewFile = tab.tabPreviewFile
+        if (previewFile == null) {
+            glide.clear(holder.tabPreview)
+            return
+        }
 
         val cachedWebViewPreview = File(webViewPreviewPersister.fullPathForFile(tab.tabId, previewFile))
         if (!cachedWebViewPreview.exists()) {
+            glide.clear(holder.tabPreview)
             return
         }
 
diff --git a/app/src/main/res/layout/popup_window_browser_menu.xml b/app/src/main/res/layout/popup_window_browser_menu.xml
@@ -27,6 +27,7 @@
         android:background="@color/white"
         android:gravity="center"
         android:orientation="horizontal"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
@@ -68,6 +69,7 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constrainedHeight="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/header">
 
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2020 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+
+    <style name="AppTheme.Dark" parent="AppTheme.BaseDark">
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/black</item>
+    </style>
+
+    <style name="AppTheme.Light" parent="AppTheme.BaseLight">
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:navigationBarColor">@color/white</item>
+    </style>
+
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -41,6 +41,7 @@
     <color name="midnight">#161616</color>
     <color name="almostBlackDark">#222222</color>
     <color name="almostBlack">#333333</color>
+    <color name="black">#000000</color>
 
     <color name="charcoalGrey">#383838</color>
     <color name="charcoalGreyTwoSemiTransparent">#d6333339</color>
diff --git a/app/version/release-notes b/app/version/release-notes
@@ -1,5 +1,5 @@
 ## What's new in this release?
-We improved our widget search; you can now also search for your apps. We also improved our page loading and tweaked our tab ordering.
+Bug fixes and other improvements.
 
 ## Have feedback?
 You can always reach us at https://duckduckgo.com/feedback.
diff --git a/app/version/version.properties b/app/version/version.properties
@@ -1 +1 @@
-VERSION=5.44.2
+VERSION=5.45.0

Original file line number	Diff line number	Diff line change
`@@ -116,4 +116,8 @@ class BrowserChromeClient @Inject constructor(private val uncaughtExceptionRepos`
`116`	`116`	`}`
`117`	`117`	`return false`
`118`	`118`	`}`
	`119`	`+`
	`120`	`+ override fun onCloseWindow(window: WebView?) {`
	`121`	`+ webViewClientListener?.closeCurrentTab()`
	`122`	`+ }`
`119`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -379,13 +379,17 @@ class BrowserTabViewModel(`
`379`	`379`	`return !currentBrowserViewState().browserShowing && navigation.hasNavigationHistory`
`380`	`380`	`}`
`381`	`381`
`382`		`- suspend fun closeCurrentTab() {`
	`382`	`+ private suspend fun removeCurrentTabFromRepository() {`
`383`	`383`	`val currentTab = tabRepository.liveSelectedTab.value`
`384`	`384`	`currentTab?.let {`
`385`	`385`	`tabRepository.delete(currentTab)`
`386`	`386`	`}`
`387`	`387`	`}`
`388`	`388`
	`389`	`+ override fun closeCurrentTab() {`
	`390`	`+ viewModelScope.launch { removeCurrentTabFromRepository() }`
	`391`	`+ }`
	`392`	`+`
`389`	`393`	`fun onUserPressedForward() {`
`390`	`394`	`if (!currentBrowserViewState().browserShowing) {`
`391`	`395`	`browserViewState.value = currentBrowserViewState().copy(browserShowing = true)`
`@@ -1058,7 +1062,7 @@ class BrowserTabViewModel(`
`1058`	`1062`	`}`
`1059`	`1063`
`1060`	`1064`	`private fun recoverTabWithQuery(query: String) {`
`1061`		`- viewModelScope.launch { closeCurrentTab() }`
	`1065`	`+ closeCurrentTab()`
`1062`	`1066`	`command.value = OpenInNewTab(query)`
`1063`	`1067`	`}`
`1064`	`1068`
Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,5 @@ interface WebViewClientListener {`
`45`	`45`	`fun openMessageInNewTab(message: Message)`
`46`	`46`	`fun recoverFromRenderProcessGone()`
`47`	`47`	`fun requiresAuthentication(request: BasicAuthenticationRequest)`
	`48`	`+ fun closeCurrentTab()`
`48`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,22 +91,21 @@ class SystemSearchViewModel(`
`91`	`91`
`92`	`92`	`appsJob?.cancel()`
`93`	`93`
`94`		`- val trimmedQuery = query.trim()`
`95`		`-`
`96`		`- if (trimmedQuery == currentViewState().queryText) {`
	`94`	`+ if (query == currentViewState().queryText) {`
`97`	`95`	`return`
`98`	`96`	`}`
`99`	`97`
`100`		`- if (trimmedQuery.isBlank()) {`
	`98`	`+ if (query.isBlank()) {`
`101`	`99`	`userClearedQuery()`
`102`	`100`	`return`
`103`	`101`	`}`
`104`	`102`
`105`		`- viewState.value = currentViewState().copy(queryText = trimmedQuery)`
`106`		`- autoCompletePublishSubject.accept(trimmedQuery)`
	`103`	`+ viewState.value = currentViewState().copy(queryText = query)`
`107`	`104`
	`105`	`+ val trimmedQuery = query.trim()`
	`106`	`+ autoCompletePublishSubject.accept(trimmedQuery)`
`108`	`107`	`appsJob = viewModelScope.launch(dispatchers.io()) {`
`109`		`- updateAppResults(deviceAppLookup.query(query))`
	`108`	`+ updateAppResults(deviceAppLookup.query(trimmedQuery))`
`110`	`109`	`}`
`111`	`110`	`}`
`112`	`111`
Original file line number	Diff line number	Diff line change
`@@ -119,10 +119,15 @@ class TabSwitcherAdapter(private val itemClickListener: TabSwitcherListener, pri`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`private fun loadTabPreviewImage(tab: TabEntity, glide: GlideRequests, holder: TabViewHolder) {`
`122`		`- val previewFile = tab.tabPreviewFile ?: return`
	`122`	`+ val previewFile = tab.tabPreviewFile`
	`123`	`+ if (previewFile == null) {`
	`124`	`+ glide.clear(holder.tabPreview)`
	`125`	`+ return`
	`126`	`+ }`
`123`	`127`
`124`	`128`	`val cachedWebViewPreview = File(webViewPreviewPersister.fullPathForFile(tab.tabId, previewFile))`
`125`	`129`	`if (!cachedWebViewPreview.exists()) {`
	`130`	`+ glide.clear(holder.tabPreview)`
`126`	`131`	`return`
`127`	`132`	`}`
`128`	`133`