Merge branch 'release/5.20.0'

Author: CDRussell

app/build.gradle

@@ -78,14 +78,15 @@ android {
 
 ext {
     androidX = "1.0.2"
-    materialDesign = "1.1.0-alpha02"
+    materialDesign = "1.0.0"
     architectureComponents = "1.1.1"
     architectureComponentsExtensions = "1.1.1"
     androidKtx = "1.0.1"
+    fragmentKtx = "1.0.0"
     constraintLayout = "2.0.0-alpha3"
     lifecycle = "2.0.0"
-    room = "2.1.0-alpha04"
-    workManager = "1.0.0-beta03"
+    room = "2.1.0-alpha05"
+    workManager = "2.0.0"
     legacySupport = "1.0.0"
     espressoCore = "3.1.1"
     coreTesting = "2.0.0"
@@ -101,7 +102,7 @@ ext {
     okHttp = "3.10.0"
     rxJava = "2.1.10"
     rxAndroid = "2.0.2"
-    timber = "4.6.1"
+    timber = "4.7.1"
     rxRelay = "2.0.0"
     leakCanary = "1.6.2"
     mockito = "2.18.3"
@@ -112,6 +113,8 @@ ext {
 
 dependencies {
     implementation "androidx.legacy:legacy-support-v4:$legacySupport"
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0-beta01'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0'
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanary"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanary"
 
@@ -124,6 +127,7 @@ dependencies {
     implementation "com.squareup.retrofit2:retrofit:$retrofit"
     implementation "com.squareup.retrofit2:converter-moshi:$retrofit"
     implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit"
+    implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
     implementation "io.reactivex.rxjava2:rxjava:$rxJava"
     implementation "io.reactivex.rxjava2:rxandroid:$rxAndroid"
     implementation "com.jakewharton.timber:timber:$timber"
@@ -139,6 +143,7 @@ dependencies {
 
     // Android KTX
     implementation "androidx.core:core-ktx:$androidKtx"
+    implementation "androidx.fragment:fragment-ktx:$fragmentKtx"
 
     // ViewModel and LiveData
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle"
@@ -153,7 +158,7 @@ dependencies {
     androidTestImplementation "androidx.room:room-testing:$room"
 
     // WorkManager
-    implementation "android.arch.work:work-runtime-ktx:$workManager"
+    implementation "androidx.work:work-runtime-ktx:$workManager"
 
     // Dagger
     kapt "com.google.dagger:dagger-android-processor:$dagger"

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

@@ -18,6 +18,7 @@ package com.duckduckgo.app.browser
 
 import android.view.MenuItem
 import android.view.View
+import android.webkit.WebView
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
@@ -34,11 +35,12 @@ import com.duckduckgo.app.browser.LongPressHandler.RequiredAction.DownloadFile
 import com.duckduckgo.app.browser.LongPressHandler.RequiredAction.OpenInNewTab
 import com.duckduckgo.app.browser.addtohome.AddToHomeCapabilityDetector
 import com.duckduckgo.app.browser.favicon.FaviconDownloader
+import com.duckduckgo.app.browser.model.LongPressTarget
 import com.duckduckgo.app.browser.omnibar.OmnibarEntryConverter
 import com.duckduckgo.app.browser.session.WebViewSessionStorage
 import com.duckduckgo.app.cta.db.DismissedCtaDao
 import com.duckduckgo.app.cta.ui.CtaViewModel
-import com.duckduckgo.app.feedback.db.SurveyDao
+import com.duckduckgo.app.survey.db.SurveyDao
 import com.duckduckgo.app.global.db.AppConfigurationDao
 import com.duckduckgo.app.global.db.AppConfigurationEntity
 import com.duckduckgo.app.global.db.AppDatabase
@@ -435,7 +437,7 @@ class BrowserTabViewModelTest {
     @Test
     fun whenUrlChangedWithDuckDuckGoUrlContainingQueryThenAtbRefreshed() {
         changeUrl("http://duckduckgo.com?q=test")
-        verify(mockStatisticsUpdater).refreshRetentionAtb()
+        verify(mockStatisticsUpdater).refreshSearchRetentionAtb()
     }
 
     @Test
@@ -695,11 +697,12 @@ class BrowserTabViewModelTest {
 
     @Test
     fun whenUserSelectsDownloadImageOptionFromContextMenuThenDownloadFileCommandIssued() {
-        whenever(mockLongPressHandler.userSelectedMenuItem(anyString(), any()))
+        whenever(mockLongPressHandler.userSelectedMenuItem(any(), any()))
             .thenReturn(DownloadFile("example.com"))
 
         val mockMenuItem: MenuItem = mock()
-        testee.userSelectedItemFromLongPressMenu("example.com", mockMenuItem)
+        val longPressTarget = LongPressTarget(url = "example.com", type = WebView.HitTestResult.SRC_ANCHOR_TYPE)
+        testee.userSelectedItemFromLongPressMenu(longPressTarget, mockMenuItem)
         verify(mockCommandObserver, atLeastOnce()).onChanged(commandCaptor.capture())
         assertTrue(commandCaptor.lastValue is Command.DownloadImage)
 
@@ -781,7 +784,8 @@ class BrowserTabViewModelTest {
     fun whenUserSelectsOpenTabThenTabCommandSent() {
         whenever(mockLongPressHandler.userSelectedMenuItem(any(), any())).thenReturn(OpenInNewTab("http://example.com"))
         val mockMenItem: MenuItem = mock()
-        testee.userSelectedItemFromLongPressMenu("http://example.com", mockMenItem)
+        val longPressTarget = LongPressTarget(url = "http://example.com", type = WebView.HitTestResult.SRC_ANCHOR_TYPE)
+        testee.userSelectedItemFromLongPressMenu(longPressTarget, mockMenItem)
         val command = captureCommands().value as Command.OpenInNewTab
         assertEquals("http://example.com", command.query)
     }

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

@@ -20,6 +20,7 @@ import android.view.ContextMenu
 import android.view.MenuItem
 import android.webkit.WebView.HitTestResult
 import androidx.test.platform.app.InstrumentationRegistry
+import com.duckduckgo.app.browser.model.LongPressTarget
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.nhaarman.mockitokotlin2.eq
 import com.nhaarman.mockitokotlin2.never
@@ -127,22 +128,25 @@ class WebViewLongPressHandlerTest {
     @Test
     fun whenUserSelectedDownloadImageOptionThenActionIsDownloadFileActionRequired() {
         whenever(mockMenuItem.itemId).thenReturn(WebViewLongPressHandler.CONTEXT_MENU_ID_DOWNLOAD_IMAGE)
-        val action = testee.userSelectedMenuItem("example.com", mockMenuItem)
+        val longPressTarget = LongPressTarget(url = "example.com", type = HitTestResult.SRC_ANCHOR_TYPE)
+        val action = testee.userSelectedMenuItem(longPressTarget, mockMenuItem)
         assertTrue(action is LongPressHandler.RequiredAction.DownloadFile)
     }
 
     @Test
     fun whenUserSelectedDownloadImageOptionThenDownloadFileWithCorrectUrlReturned() {
         whenever(mockMenuItem.itemId).thenReturn(WebViewLongPressHandler.CONTEXT_MENU_ID_DOWNLOAD_IMAGE)
-        val action = testee.userSelectedMenuItem("example.com", mockMenuItem) as LongPressHandler.RequiredAction.DownloadFile
+        val longPressTarget = LongPressTarget(url = "example.com", type = HitTestResult.SRC_ANCHOR_TYPE)
+        val action = testee.userSelectedMenuItem(longPressTarget, mockMenuItem) as LongPressHandler.RequiredAction.DownloadFile
         assertEquals("example.com", action.url)
     }
 
     @Test
     fun whenUserSelectedUnknownOptionThenNoActionRequiredReturned() {
         val unknownMenuId = 123
         whenever(mockMenuItem.itemId).thenReturn(unknownMenuId)
-        val action = testee.userSelectedMenuItem("example.com", mockMenuItem)
+        val longPressTarget = LongPressTarget(url = "example.com", type = HitTestResult.SRC_ANCHOR_TYPE)
+        val action = testee.userSelectedMenuItem(longPressTarget, mockMenuItem)
         assertTrue(action == LongPressHandler.RequiredAction.None)
     }
 

app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaViewModelTest.kt

@@ -23,13 +23,13 @@ import com.duckduckgo.app.InstantSchedulersRule
 import com.duckduckgo.app.cta.db.DismissedCtaDao
 import com.duckduckgo.app.cta.model.CtaId
 import com.duckduckgo.app.cta.model.DismissedCta
-import com.duckduckgo.app.feedback.db.SurveyDao
-import com.duckduckgo.app.feedback.model.Survey
-import com.duckduckgo.app.feedback.model.Survey.Status.SCHEDULED
 import com.duckduckgo.app.global.db.AppDatabase
 import com.duckduckgo.app.global.install.AppInstallStore
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.*
+import com.duckduckgo.app.survey.db.SurveyDao
+import com.duckduckgo.app.survey.model.Survey
+import com.duckduckgo.app.survey.model.Survey.Status.SCHEDULED
 import com.duckduckgo.app.widget.ui.WidgetCapabilities
 import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.eq

app/src/androidTest/java/com/duckduckgo/app/di/StubStatisticsModule.kt

@@ -34,11 +34,16 @@ class StubStatisticsModule {
     @Provides
     fun stubStatisticsUpdater(): StatisticsUpdater {
         return object : StatisticsUpdater {
-            override fun refreshRetentionAtb() {
-            }
 
             override fun initializeAtb() {
             }
+
+            override fun refreshAppRetentionAtb() {
+            }
+
+            override fun refreshSearchRetentionAtb() {
+            }
+
         }
     }
 

app/src/androidTest/java/com/duckduckgo/app/feedback/ui/BrokenSiteViewModelTest.kt

@@ -0,0 +1,128 @@
+package com.duckduckgo.app.feedback.ui
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.lifecycle.Observer
+import com.duckduckgo.app.InstantSchedulersRule
+import com.duckduckgo.app.brokensite.BrokenSiteViewModel
+import com.duckduckgo.app.brokensite.BrokenSiteViewModel.Command
+import com.duckduckgo.app.brokensite.api.BrokenSiteSender
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.never
+import com.nhaarman.mockitokotlin2.verify
+import org.junit.After
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.mockito.Mock
+import org.mockito.MockitoAnnotations
+
+class BrokenSiteViewModelTest {
+
+    @get:Rule
+    @Suppress("unused")
+    var instantTaskExecutorRule = InstantTaskExecutorRule()
+
+    @get:Rule
+    @Suppress("unused")
+    val schedulers = InstantSchedulersRule()
+
+    @Mock
+    private lateinit var mockBrokenSiteSender: BrokenSiteSender
+
+    @Mock
+    private lateinit var mockCommandObserver: Observer<BrokenSiteViewModel.Command>
+
+    private lateinit var testee: BrokenSiteViewModel
+
+    private val viewState: BrokenSiteViewModel.ViewState
+        get() = testee.viewState.value!!
+
+    @Before
+    fun before() {
+        MockitoAnnotations.initMocks(this)
+        testee = BrokenSiteViewModel(mockBrokenSiteSender)
+        testee.command.observeForever(mockCommandObserver)
+    }
+
+    @After
+    fun after() {
+        testee.command.removeObserver(mockCommandObserver)
+    }
+
+    @Test
+    fun whenInitializedThenCannotSubmit() {
+        assertFalse(viewState.submitAllowed)
+    }
+
+    @Test
+    fun whenNoUrlProvidedThenUrlFocused() {
+        testee.setInitialBrokenSite(null)
+        verify(mockCommandObserver).onChanged(Command.FocusUrl)
+    }
+
+    @Test
+    fun whenUrlProvidedThenMessageFocused() {
+        testee.setInitialBrokenSite(url)
+        verify(mockCommandObserver).onChanged(Command.FocusMessage)
+    }
+
+    @Test
+    fun whenUrlAndMessageNotEmptyThenCanSubmit() {
+        testee.onBrokenSiteUrlChanged(url)
+        testee.onFeedbackMessageChanged(message)
+        assertTrue(viewState.submitAllowed)
+    }
+
+    @Test
+    fun whenNullUrlThenCannotSubmit() {
+        testee.onBrokenSiteUrlChanged(null)
+        testee.onFeedbackMessageChanged(message)
+        assertFalse(viewState.submitAllowed)
+    }
+
+    @Test
+    fun whenEmptyUrlThenCannotSubmit() {
+        testee.onBrokenSiteUrlChanged(" ")
+        testee.onFeedbackMessageChanged(message)
+        assertFalse(viewState.submitAllowed)
+    }
+
+    @Test
+    fun whenNullMessageThenCannotSubmit() {
+        testee.onBrokenSiteUrlChanged(url)
+        testee.onFeedbackMessageChanged(null)
+        assertFalse(viewState.submitAllowed)
+    }
+
+    @Test
+    fun whenEmptyMessageThenCannotSubmit() {
+        testee.onBrokenSiteUrlChanged(url)
+        testee.onFeedbackMessageChanged(" ")
+        assertFalse(viewState.submitAllowed)
+    }
+
+    @Test
+    fun whenCanSubmitBrokenSiteAndSubmitPressedThenFeedbackSubmitted() {
+        testee.onBrokenSiteUrlChanged(url)
+        testee.onFeedbackMessageChanged(message)
+        testee.onSubmitPressed()
+
+        verify(mockBrokenSiteSender).submitBrokenSiteFeedback(message, url)
+        verify(mockCommandObserver).onChanged(Command.ConfirmAndFinish)
+    }
+
+    @Test
+    fun whenCannotSubmitBrokenSiteAndSubmitPressedThenFeedbackNotSubmitted() {
+        testee.onSubmitPressed()
+        verify(mockBrokenSiteSender, never()).submitBrokenSiteFeedback(any(), any())
+        verify(mockCommandObserver, never()).onChanged(Command.ConfirmAndFinish)
+    }
+
+    companion object Constants {
+        private const val url = "http://example.com"
+        private const val message = "Feedback message"
+    }
+
+}