Merge branch 'release/5.34.0'

Author: marcosholgado

.github/CODEOWNERS

@@ -1,4 +1,4 @@
 #These people are listed as being the code owners for this project. As such, they will be automatically added as a reviewer when a PR is created.
 #For more details on how this is configured, see https://help.github.com/articles/about-code-owners/
 
-*       @CDRussell @subsymbolic
+*       @CDRussell @subsymbolic @marcosholgado

TRANSLATIONS.md

@@ -28,18 +28,13 @@ If you know any of the following languages and would like to help us improve the
 
 ## How to help
 
-There is a branch containing the current translations, called [`feature/app_translations`](https://github.com/duckduckgo/Android/tree/feature/app_translations/app/src/main/res).
-1. Each language has a `values` directory containing the language code, and the `strings.xml` file contains the translations. Examples:
-    - Italian translation files are located within `values-it/strings.xml`  
-    - Spanish translation files are located within `values-es/strings.xml`
-1. If you notice anything which could be improved, you should create a PR containing the improved language suggestions and those changes will be merged into that branch if accepted.
-    1. Fork the project, and clone your forked project to your machine. [Instructions](https://help.github.com/en/articles/fork-a-repo)
-    1. Checkout the translations branch `git checkout --track origin/feature/app_translations`
-    1. Make the changes to the relevant `strings.xml` file, and commit
+1. Each language has a [`values`](https://github.com/duckduckgo/Android/tree/develop/app/src/main/res) directory containing the language code, and the `strings.xml` file contains the translations. Examples:
+    - Italian translation files are located within `app/src/main/res/values-it/strings.xml`  
+    - Spanish translation files are located within `app/src/main/res/values-es/strings.xml`
+1. If you notice anything which could be improved, you should create a PR containing the improved language suggestions.
+    1. Make the changes to the relevant `strings.xml` file
     1. Test the app in the language you've improved, and ensure the changed strings look good
-    1. Push the changes to your fork `git push origin`
-    1. Create a Pull Request for your changes. [Instructions](https://help.github.com/en/articles/creating-a-pull-request-from-a-fork)
-        - Ensure the base branch in your PR is `feature/app_translations`
-      
+    1. Create a PR. As well as the changes themselves, explaining _why_ the changes are an improvement helps a lot.
+             
 
 ℹ️ Please note we are not looking for help with other languages at this time; only the languages listed above. We may open up requests in future for additional languages.

app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt

@@ -218,7 +218,7 @@ class BrowserTabViewModelTest {
         testee.command.observeForever(mockCommandObserver)
 
         whenever(mockOmnibarConverter.convertQueryToUrl(any())).thenReturn("duckduckgo.com")
-        whenever(mockVariantManager.getVariant()).thenReturn(VariantManager.DEFAULT_VARIANT)
+        whenever(mockVariantManager.getVariant()).thenReturn(DEFAULT_VARIANT)
     }
 
     @After
@@ -481,7 +481,9 @@ class BrowserTabViewModelTest {
 
     @Test
     fun whenProgressChangesToFinishedAndImprovedTabUxVariantActiveThenWebViewPreviewGenerated() {
-        whenever(mockVariantManager.getVariant()).thenReturn(Variant("mx", 1.0, listOf(VariantManager.VariantFeature.TabSwitcherGrid)))
+        whenever(mockVariantManager.getVariant()).thenReturn(
+            Variant("mx", 1.0, listOf(VariantManager.VariantFeature.TabSwitcherGrid), filterBy = { true })
+        )
         updateUrl("https://example.com", "https://example.com", true)
         testee.progressChanged(100)
         val command = captureCommands().lastValue as Command.GenerateWebViewPreviewImage

app/src/androidTest/java/com/duckduckgo/app/browser/defaultbrowsing/DefaultBrowserObserverTest.kt

@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2019 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.
+ */
+
+package com.duckduckgo.app.browser.defaultbrowsing
+
+import com.duckduckgo.app.global.install.AppInstallStore
+import com.duckduckgo.app.statistics.pixels.Pixel
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.eq
+import com.nhaarman.mockitokotlin2.never
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import org.junit.Test
+import org.junit.Before
+import org.mockito.Mock
+import org.mockito.MockitoAnnotations
+
+class DefaultBrowserObserverTest {
+
+    private lateinit var testee: DefaultBrowserObserver
+
+    @Mock
+    private lateinit var mockDefaultBrowserDetector: DefaultBrowserDetector
+
+    @Mock
+    private lateinit var mockAppInstallStore: AppInstallStore
+
+    @Mock
+    private lateinit var mockPixel: Pixel
+
+    @Before
+    fun setup() {
+        MockitoAnnotations.initMocks(this)
+        testee = DefaultBrowserObserver(mockDefaultBrowserDetector, mockAppInstallStore, mockPixel)
+    }
+
+    @Test
+    fun whenDDGIsDefaultBrowserIfItWasNotBeforeThenFireSetPixel() {
+        whenever(mockDefaultBrowserDetector.isDefaultBrowser()).thenReturn(true)
+        whenever(mockAppInstallStore.defaultBrowser).thenReturn(false)
+        val params = mapOf(
+            Pixel.PixelParameter.DEFAULT_BROWSER_SET_FROM_ONBOARDING to false.toString()
+        )
+
+        testee.onApplicationResumed()
+
+        verify(mockPixel).fire(Pixel.PixelName.DEFAULT_BROWSER_SET, params)
+    }
+
+    @Test
+    fun whenDDGIsNotDefaultBrowserIfItWasNotBeforeThenDoNotFireSetPixel() {
+        whenever(mockDefaultBrowserDetector.isDefaultBrowser()).thenReturn(false)
+        whenever(mockAppInstallStore.defaultBrowser).thenReturn(false)
+
+        testee.onApplicationResumed()
+
+        verify(mockPixel, never()).fire(eq(Pixel.PixelName.DEFAULT_BROWSER_SET), any())
+    }
+
+    @Test
+    fun whenDDGIsDefaultBrowserIfItWasBeforeThenDoNotFireSetPixel() {
+        whenever(mockDefaultBrowserDetector.isDefaultBrowser()).thenReturn(true)
+        whenever(mockAppInstallStore.defaultBrowser).thenReturn(true)
+
+        testee.onApplicationResumed()
+
+        verify(mockPixel, never()).fire(eq(Pixel.PixelName.DEFAULT_BROWSER_SET), any())
+    }
+
+    @Test
+    fun whenDDGIsNotDefaultBrowserIfItWasBeforeThenFireUnsetPixel() {
+        whenever(mockDefaultBrowserDetector.isDefaultBrowser()).thenReturn(false)
+        whenever(mockAppInstallStore.defaultBrowser).thenReturn(true)
+
+        testee.onApplicationResumed()
+
+        verify(mockPixel).fire(Pixel.PixelName.DEFAULT_BROWSER_UNSET)
+    }
+}

app/src/androidTest/java/com/duckduckgo/app/global/ChecksumTest.kt renamed to app/src/androidTest/java/com/duckduckgo/app/global/HashUtilitiesTest.kt

@@ -19,27 +19,34 @@ package com.duckduckgo.app.global
 import org.junit.Assert.*
 import org.junit.Test
 
-class ChecksumTest {
+class HashUtilitiesTest {
 
     @Test
-    fun whenSha256ChecksumCalledThenChecksumIsCorrect() {
+    fun whenSha1HashCalledOnStringThenResultIsCorrect() {
+        val result = helloWorldText.sha1
+        assertEquals(helloWorldSha1, result)
+    }
+
+    @Test
+    fun whenSha256HashCalledOnBytesThenResultIsCorrect() {
         val result = helloWorldText.toByteArray().sha256
         assertEquals(helloWorldSha256, result)
     }
 
     @Test
-    fun whenSha256CheckumCorrectThenVerifyIsTrue() {
+    fun whenCorrectSha256HashUsedThenVerifyIsTrue() {
         assertTrue(helloWorldText.toByteArray().verifySha256(helloWorldSha256))
     }
 
     @Test
-    fun whenSha256CheckumIncorrectThenVerifyIsFalse() {
+    fun whenIncorrectByteSha256HashUsedThenVerifyIsFalse() {
         assertFalse(helloWorldText.toByteArray().verifySha256(otherSha256))
     }
 
     companion object {
         const val helloWorldText = "Hello World!"
         const val helloWorldSha256 = "7f83b1657ff1fc53b92dc18148a1d65dfc2d4b1fa3d677284addd200126d9069"
+        const val helloWorldSha1 = "2ef7bde608ce5404e97d5f042f95f89f1c232871"
         const val otherSha256 = "f97e9da0e3b879f0a9df979ae260a5f7e1371edb127c1862d4f861981166cdc1"
     }
 }

app/src/androidTest/java/com/duckduckgo/app/httpsupgrade/HttpsUpgraderTest.kt

@@ -18,56 +18,105 @@ package com.duckduckgo.app.httpsupgrade
 
 import android.net.Uri
 import com.duckduckgo.app.httpsupgrade.api.HttpsBloomFilterFactory
+import com.duckduckgo.app.httpsupgrade.api.HttpsUpgradeService
 import com.duckduckgo.app.httpsupgrade.db.HttpsWhitelistDao
+import com.duckduckgo.app.statistics.pixels.Pixel
+import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
+import okhttp3.ResponseBody
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
+import retrofit2.Call
+import retrofit2.Response
 
 class HttpsUpgraderTest {
 
     lateinit var testee: HttpsUpgrader
 
     private var mockHttpsBloomFilterFactory: HttpsBloomFilterFactory = mock()
     private var mockWhitelistDao: HttpsWhitelistDao = mock()
+    private var mockUpgradeService: HttpsUpgradeService = mock()
+    private var mockServiceCall: Call<List<String>> = mock()
+
+    private var mockPixel: Pixel = mock()
     private var bloomFilter = BloomFilter(100, 0.01)
 
     @Before
     fun before() {
         whenever(mockHttpsBloomFilterFactory.create()).thenReturn(bloomFilter)
-        testee = HttpsUpgraderImpl(mockWhitelistDao, mockHttpsBloomFilterFactory)
+        testee = HttpsUpgraderImpl(mockWhitelistDao, mockHttpsBloomFilterFactory, mockUpgradeService, mockPixel)
         testee.reloadData()
     }
 
     @Test
-    fun whenUriIsHttpsThenShouldNotUpgrade() {
-        assertFalse(testee.shouldUpgrade(Uri.parse("https://www.example.com")))
+    fun whenHttpUriIsInLocalListThenShouldUpgrade() {
+        bloomFilter.add("www.local.url")
+        assertTrue(testee.shouldUpgrade(Uri.parse("http://www.local.url")))
+    }
+
+    @Test
+    fun whenHttpsUriThenShouldNotUpgrade() {
+        assertFalse(testee.shouldUpgrade(Uri.parse("https://www.local.url")))
+    }
+
+    @Test
+    fun whenHttpUriHasOnlyPartDomainInLocalListThenShouldNotUpgrade() {
+        bloomFilter.add("local.url")
+        assertFalse(testee.shouldUpgrade(Uri.parse("http://www.local.url")))
     }
 
     @Test
-    fun whenHttpUriIsNotInBloomFilterThenShouldNotUpgrade() {
-        assertFalse(testee.shouldUpgrade(Uri.parse("http://www.example.com")))
+    fun whenHttpUriIsInLocalListAndInWhitelistThenShouldNotUpgrade() {
+        bloomFilter.add("www.local.url")
+        whenever(mockWhitelistDao.contains("www.local.url")).thenReturn(true)
+        assertFalse(testee.shouldUpgrade(Uri.parse("http://www.local.url")))
     }
 
     @Test
-    fun whenHttpUriIsInBloomFilterThenShouldUpgrade() {
-        bloomFilter.add("www.example.com")
-        assertTrue(testee.shouldUpgrade(Uri.parse("http://www.example.com")))
+    fun whenHttpUriIsNotInLocalListButCanBeUpgradedByServiceThenShouldUpgrade() {
+        whenever(mockServiceCall.execute()).thenReturn(Response.success(serviceResponse()))
+        whenever(mockUpgradeService.upgradeListForPartialHost(any())).thenReturn(mockServiceCall)
+        assertTrue(testee.shouldUpgrade(Uri.parse("http://service.url")))
     }
 
     @Test
-    fun whenHttpUriHasOnlyPartDomainInBloomFilterThenShouldNotUpgrade() {
-        bloomFilter.add("example.com")
-        assertFalse(testee.shouldUpgrade(Uri.parse("http://www.example.com")))
+    fun whenHttpUriIsNotInLocalListAndCannotBeUpgradedByServiceThenShouldNotUpgrade() {
+        whenever(mockServiceCall.execute()).thenReturn(Response.success(serviceResponse()))
+        whenever(mockUpgradeService.upgradeListForPartialHost(any())).thenReturn(mockServiceCall)
+        assertFalse(testee.shouldUpgrade(Uri.parse("http://unknown.com")))
     }
 
     @Test
-    fun whenHttpUriIsInBloomFilterAndInWhitelistThenShouldNotUpgrade() {
-        bloomFilter.add("www.example.com")
-        whenever(mockWhitelistDao.contains("www.example.com")).thenReturn(true)
-        assertFalse(testee.shouldUpgrade(Uri.parse("http://www.example.com")))
+    fun whenHttpUriIsNotInLocalListAndServiceRequestFailsThenShouldNotUpgrade() {
+        whenever(mockServiceCall.execute()).thenReturn(Response.error(500, ResponseBody.create(null, "")))
+        whenever(mockUpgradeService.upgradeListForPartialHost(any())).thenReturn(mockServiceCall)
+        assertFalse(testee.shouldUpgrade(Uri.parse("http://service.url")))
     }
 
+    @Test
+    fun whenBloomFilterIsNotLoadedAndUrlIsInServiceListThenShouldUpgrade() {
+        whenever(mockHttpsBloomFilterFactory.create()).thenReturn(null)
+        whenever(mockServiceCall.execute()).thenReturn(Response.success(serviceResponse()))
+        whenever(mockUpgradeService.upgradeListForPartialHost(any())).thenReturn(mockServiceCall)
+        assertTrue(testee.shouldUpgrade(Uri.parse("http://service.url")))
+    }
+
+    @Test
+    fun testWhenBloomFilterIsNotLoadedAndUrlNotInServiceListThenShouldNotUpgrade() {
+        whenever(mockHttpsBloomFilterFactory.create()).thenReturn(null)
+        whenever(mockServiceCall.execute()).thenReturn(Response.success(serviceResponse()))
+        whenever(mockUpgradeService.upgradeListForPartialHost(any())).thenReturn(mockServiceCall)
+        assertFalse(testee.shouldUpgrade(Uri.parse("http://unknown.com")))
+    }
+
+    private fun serviceResponse(): List<String> {
+        return arrayListOf(
+            "cfb1a171724ad0b8f108526d6a201667f74691e4",
+            "cfb10e3da9ae3bc2ba7e4641c911987da63aa0a7",
+            "cfb18efe21acd63556dd75bcae7003a2fff90752"
+        )
+    }
 }

app/src/androidTest/java/com/duckduckgo/app/httpsupgrade/db/HttpsWhitelistDaoTest.kt

@@ -86,7 +86,7 @@ class HttpsWhitelistDaoTest {
     }
 
     @Test
-    fun whenhAllDeletedThenContainsDomainIsFalse() {
+    fun whenAllDeletedThenContainsDomainIsFalse() {
         dao.insertAll(listOf(HttpsWhitelistedDomain(domain)))
         dao.deleteAll()
         assertFalse(dao.contains(domain))

app/src/androidTest/java/com/duckduckgo/app/integration/AtbIntegrationTest.kt

@@ -57,7 +57,7 @@ class AtbIntegrationTest {
         statisticsStore = StatisticsSharedPreferences(InstrumentationRegistry.getInstrumentation().targetContext)
         statisticsStore.clearAtb()
 
-        whenever(mockVariantManager.getVariant()).thenReturn(Variant("ma", 100.0))
+        whenever(mockVariantManager.getVariant()).thenReturn(Variant("ma", 100.0, filterBy = { true }))
         service = getDaggerComponent().retrofit().create(StatisticsService::class.java)
         testee = StatisticsRequester(statisticsStore, service, mockVariantManager)
     }

app/src/androidTest/java/com/duckduckgo/app/onboarding/ui/OnboardingPageManagerPageCountTest.kt

@@ -17,6 +17,7 @@
 package com.duckduckgo.app.onboarding.ui
 
 import com.duckduckgo.app.browser.defaultbrowsing.DefaultBrowserDetector
+import com.duckduckgo.app.statistics.VariantManager
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
 import org.junit.Assert.assertEquals
@@ -31,10 +32,11 @@ class OnboardingPageManagerPageCountTest(private val testCase: TestCase) {
     private lateinit var testee: OnboardingPageManager
     private val onboardingPageBuilder: OnboardingPageBuilder = mock()
     private val mockDefaultBrowserDetector: DefaultBrowserDetector = mock()
+    private val mockVariantManager: VariantManager = mock()
 
     @Before
     fun setup() {
-        testee = OnboardingPageManagerWithTrackerBlocking(onboardingPageBuilder, mockDefaultBrowserDetector)
+        testee = OnboardingPageManagerWithTrackerBlocking(onboardingPageBuilder, mockDefaultBrowserDetector, mockVariantManager)
     }
 
     @Test

app/src/androidTest/java/com/duckduckgo/app/onboarding/ui/OnboardingPageManagerTest.kt

@@ -34,7 +34,7 @@ class OnboardingPageManagerTest {
 
     @Before
     fun setup() {
-        testee = OnboardingPageManagerWithTrackerBlocking(onboardingPageBuilder, mockDefaultBrowserDetector)
+        testee = OnboardingPageManagerWithTrackerBlocking(onboardingPageBuilder, mockDefaultBrowserDetector, variantManager)
     }
 
     @Test