Merge branch 'release/0.8.0'

Author: subsymbolic

app/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'kotlin-kapt'
 apply from: '../versioning.gradle'
 
 ext {
-    VERSION_NAME = "0.7.0"
+    VERSION_NAME = "0.8.0"
 }
 
 android {

app/lint.xml

@@ -6,4 +6,7 @@
     <issue id="IconExpectedSize">
         <ignore path="src/main/res/drawable-*/privacygrade_icon_*" />
     </issue>
+    <issue id="UnusedResources">
+        <ignore path="src/main/res/drawable-*/network_pill_*" />
+    </issue>
 </lint>

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

@@ -19,8 +19,8 @@ package com.duckduckgo.app.browser
 import android.arch.core.executor.testing.InstantTaskExecutorRule
 import android.arch.lifecycle.Observer
 import android.net.Uri
-import com.duckduckgo.app.browser.BrowserViewModel.NavigationCommand
 import com.duckduckgo.app.browser.omnibar.OmnibarEntryConverter
+import com.duckduckgo.app.global.StringResolver
 import com.duckduckgo.app.privacymonitor.model.PrivacyGrade
 import com.duckduckgo.app.privacymonitor.store.PrivacyMonitorRepository
 import com.duckduckgo.app.privacymonitor.store.TermsOfServiceStore
@@ -43,8 +43,9 @@ class BrowserViewModelTest {
     var instantTaskExecutorRule = InstantTaskExecutorRule()
 
     private lateinit var queryObserver: Observer<String>
-    private lateinit var navigationObserver: Observer<NavigationCommand>
+    private lateinit var navigationObserver: Observer<BrowserViewModel.Command>
     private lateinit var termsOfServiceStore: TermsOfServiceStore
+    private lateinit var mockStringResolver: StringResolver
     private lateinit var testee: BrowserViewModel
 
     private val testOmnibarConverter: OmnibarEntryConverter = object : OmnibarEntryConverter {
@@ -55,18 +56,22 @@ class BrowserViewModelTest {
 
     @Before
     fun before() {
+        mockStringResolver = mock()
         queryObserver = mock()
         navigationObserver = mock()
         termsOfServiceStore = mock()
-        testee = BrowserViewModel(testOmnibarConverter, DuckDuckGoUrlDetector(), termsOfServiceStore, TrackerNetworks(), PrivacyMonitorRepository())
+        testee = BrowserViewModel(testOmnibarConverter, DuckDuckGoUrlDetector(), termsOfServiceStore, TrackerNetworks(), PrivacyMonitorRepository(), object : StringResolver {
+            override fun getString(stringId: Int): String = ""
+            override fun getString(stringId: Int, vararg formatArgs: Any): String = ""
+        })
         testee.query.observeForever(queryObserver)
-        testee.navigation.observeForever(navigationObserver)
+        testee.command.observeForever(navigationObserver)
     }
 
     @After
     fun after() {
         testee.query.removeObserver(queryObserver)
-        testee.navigation.removeObserver(navigationObserver)
+        testee.command.removeObserver(navigationObserver)
     }
 
     @Test
@@ -155,13 +160,13 @@ class BrowserViewModelTest {
     @Test
     fun whenUserDismissesKeyboardBeforeBrowserShownThenShouldNavigateToLandingPage() {
         testee.userDismissedKeyboard()
-        verify(navigationObserver).onChanged(NavigationCommand.LANDING_PAGE)
+        verify(navigationObserver).onChanged(ArgumentMatchers.any(BrowserViewModel.Command.LandingPage::class.java))
     }
 
     @Test
     fun whenUserDismissesKeyboardAfterBrowserShownThenShouldNotNavigateToLandingPage() {
         testee.urlChanged("")
-        verify(navigationObserver, never()).onChanged(NavigationCommand.LANDING_PAGE)
+        verify(navigationObserver, never()).onChanged(ArgumentMatchers.any(BrowserViewModel.Command.LandingPage::class.java))
     }
 
     @Test

app/src/androidTest/java/com/duckduckgo/app/httpsupgrade/HTTPSUpgraderTest.kt renamed to app/src/androidTest/java/com/duckduckgo/app/httpsupgrade/HttpsUpgraderTest.kt

@@ -17,22 +17,22 @@
 package com.duckduckgo.app.httpsupgrade
 
 import android.net.Uri
-import com.duckduckgo.app.httpsupgrade.db.HTTPSUpgradeDomainDAO
+import com.duckduckgo.app.httpsupgrade.db.HttpsUpgradeDomainDao
 import com.nhaarman.mockito_kotlin.mock
 import com.nhaarman.mockito_kotlin.whenever
 import org.junit.Assert.*
 import org.junit.Before
 import org.junit.Test
 
-class HTTPSUpgraderTest {
+class HttpsUpgraderTest {
 
-    lateinit var testee: HTTPSUpgrader
-    lateinit var mockDao: HTTPSUpgradeDomainDAO
+    lateinit var testee: HttpsUpgrader
+    lateinit var mockDao: HttpsUpgradeDomainDao
 
     @Before
     fun before() {
         mockDao = mock()
-        testee = HTTPSUpgrader(mockDao)
+        testee = HttpsUpgrader(mockDao)
     }
 
     @Test

app/src/androidTest/java/com/duckduckgo/app/httpsupgrade/api/HTTPSUpgradeJsonTest.kt renamed to app/src/androidTest/java/com/duckduckgo/app/httpsupgrade/api/HttpsUpgradeJsonTest.kt

@@ -21,12 +21,12 @@ import org.junit.Assert.assertEquals
 import org.junit.Test
 
 
-class HTTPSUpgradeJsonTest {
+class HttpsUpgradeJsonTest {
 
     @Test
     fun whenGivenValidJsonThenParsesCorrectly() {
-        val moshi = Moshi.Builder().add(HTTPSUpgradeDomainFromStringAdapter()).build()
-        val adapter = moshi.adapter(HTTPSUpgradeJson::class.java)
+        val moshi = Moshi.Builder().add(HttpsUpgradeDomainFromStringAdapter()).build()
+        val adapter = moshi.adapter(HttpsUpgradeJson::class.java)
         val list = adapter.fromJson(json())
         assertEquals(5, list.simpleUpgrade.top500.count())
     }

app/src/androidTest/java/com/duckduckgo/app/httpsupgrade/db/HTTPSUpgradeDomainDAOTest.kt renamed to app/src/androidTest/java/com/duckduckgo/app/httpsupgrade/db/HttpsUpgradeDomainDAOTest.kt

@@ -20,11 +20,12 @@ import android.arch.persistence.room.Room
 import android.support.test.InstrumentationRegistry
 import com.duckduckgo.app.global.db.AppDatabase
 import org.junit.After
-import org.junit.Assert.*
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 
-class HTTPSUpgradeDomainDAOTest {
+class HttpsUpgradeDomainDaoTest {
 
     companion object {
         var exactMatchDomain = "bbc.co.uk"
@@ -36,12 +37,12 @@ class HTTPSUpgradeDomainDAOTest {
     }
 
     private lateinit var db: AppDatabase
-    private lateinit var dao: HTTPSUpgradeDomainDAO
+    private lateinit var dao: HttpsUpgradeDomainDao
 
     @Before
     fun before() {
         db = Room.inMemoryDatabaseBuilder(InstrumentationRegistry.getContext(), AppDatabase::class.java).build()
-        dao = db.httpsUpgradeDomainDAO()
+        dao = db.httpsUpgradeDomainDao()
     }
 
     @After
@@ -51,44 +52,44 @@ class HTTPSUpgradeDomainDAOTest {
 
     @Test
     fun whenExactMatchDomainAddedAndThenAllDeletedThenDoesNotContainExactMatchDomain() {
-        dao.insertAll(HTTPSUpgradeDomain(exactMatchDomain))
+        dao.insertAll(HttpsUpgradeDomain(exactMatchDomain))
         dao.deleteAll()
         assertFalse(dao.contains(exactMatchDomain))
     }
 
     @Test
     fun whenWildcardDomainInsertedModelThenDoesNotContainParentOfWildcardDomain() {
-        dao.insertAll(HTTPSUpgradeDomain(wildcardDomain))
+        dao.insertAll(HttpsUpgradeDomain(wildcardDomain))
         assertFalse(dao.contains(parentOfWildcardDomain))
     }
 
     @Test
     fun whenOtherWildcardDomainInsertedThenModelDoesNotContainExampleWildcardDomain() {
-        dao.insertAll(HTTPSUpgradeDomain(otherWildcardDomain))
+        dao.insertAll(HttpsUpgradeDomain(otherWildcardDomain))
         assertFalse(dao.contains(exampleWildcardDomain))
     }
 
     @Test
     fun whenWildcardDomainInsertedThenModelDoesNotContainExactMatchDomain() {
-        dao.insertAll(HTTPSUpgradeDomain(wildcardDomain))
+        dao.insertAll(HttpsUpgradeDomain(wildcardDomain))
         assertFalse(dao.contains(exactMatchDomain))
     }
 
     @Test
     fun whenWildcardDomainInsertedThenModelContainsExampleWildcardDomain() {
-        dao.insertAll(HTTPSUpgradeDomain(wildcardDomain))
+        dao.insertAll(HttpsUpgradeDomain(wildcardDomain))
         assertTrue(dao.contains(exampleWildcardDomain))
     }
 
     @Test
     fun whenExactMatchDomainInsertedThenModelDoesNotContainOtherDomain() {
-        dao.insertAll(HTTPSUpgradeDomain(exactMatchDomain))
+        dao.insertAll(HttpsUpgradeDomain(exactMatchDomain))
         assertFalse(dao.contains(otherDomain))
     }
 
     @Test
     fun whenExactMatchDomainIsInsertedThenModelContainsExactMatchDomain() {
-        dao.insertAll(HTTPSUpgradeDomain(exactMatchDomain))
+        dao.insertAll(HttpsUpgradeDomain(exactMatchDomain))
         assertTrue(dao.contains(exactMatchDomain))
     }