Merge branch 'release/5.25.0'

Author: CDRussell

.gitignore

@@ -46,4 +46,7 @@ captures/
 fastlane/report.xml
 
 # Bitrise configuration
-bitrise.yml
+bitrise.yml
+
+# NDK files
+**/.cxx

app/build.gradle

@@ -78,12 +78,12 @@ android {
 
 ext {
     androidX = "1.0.2"
-    materialDesign = "1.0.0"
+    materialDesign = "1.1.0-alpha05"
     architectureComponents = "1.1.1"
     architectureComponentsExtensions = "1.1.1"
     androidKtx = "1.0.1"
     fragmentKtx = "1.0.0"
-    constraintLayout = "2.0.0-alpha3"
+    constraintLayout = "2.0.0-beta1"
     lifecycle = "2.1.0-alpha04"
     room = "2.1.0-alpha05"
     workManager = "2.0.0"

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

@@ -17,14 +17,14 @@
 package com.duckduckgo.app.onboarding.ui
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.browser.defaultbrowsing.DefaultBrowserDetector
 import com.duckduckgo.app.onboarding.store.OnboardingStore
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.never
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
+import org.junit.Assert.*
 import org.junit.Rule
 import org.junit.Test
 
@@ -50,29 +50,79 @@ class OnboardingViewModelTest {
     }
 
     @Test
-    fun whenFirstPageRequestedThenProtectDataReturned() {
-        val page = testee.getItem(0)
-        assertTrue(page is OnboardingPageFragment.ProtectDataPage)
+    fun whenFreshInstallFirstPageRequestedThenUnifiedWelcomePageReturned() {
+        val page = testee.getItem(0, isFreshAppInstall = true)
+        assertTrue(page is OnboardingPageFragment.UnifiedWelcomePage)
     }
 
     @Test
-    fun whenSecondPageRequestedThenNoTracePageReturned() {
-        val page = testee.getItem(1)
-        assertTrue(page is OnboardingPageFragment.NoTracePage)
+    fun whenNotFreshInstallFirstPageRequestedThenUnifiedWelcomePageReturned() {
+        val page = testee.getItem(0, isFreshAppInstall = false)
+        assertTrue(page is OnboardingPageFragment.UnifiedWelcomePage)
     }
 
     @Test
-    fun whenThirdPageRequestedWithDefaultBrowserCapableThenDefaultBrowserPageReturned() {
-        whenever(mockDefaultBrowserDetector.deviceSupportsDefaultBrowserConfiguration()).thenReturn(true)
-        val page = testee.getItem(2)
+    fun whenFreshInstallSecondPageRequestedWithDefaultBrowserCapableThenDefaultBrowserPageReturned() {
+        configureDeviceSupportsDefaultBrowser()
+        val page = testee.getItem(1, isFreshAppInstall = true)
         assertTrue(page is OnboardingPageFragment.DefaultBrowserPage)
     }
 
     @Test
-    fun whenThirdPageRequestedButDefaultBrowserNotCapableThenNoPageReturned() {
-        whenever(mockDefaultBrowserDetector.deviceSupportsDefaultBrowserConfiguration()).thenReturn(false)
-        val page = testee.getItem(2)
+    fun whenNotFreshInstallSecondPageRequestedWithDefaultBrowserCapableThenNoPageReturned() {
+        configureDeviceSupportsDefaultBrowser()
+        val page = testee.getItem(1, isFreshAppInstall = false)
+        assertNull(page)
+    }
+
+    @Test
+    fun whenFreshInstallSecondPageRequestedButDefaultBrowserNotCapableThenNoPageReturned() {
+        configureDeviceDoesNotSupportDefaultBrowser()
+        val page = testee.getItem(1, isFreshAppInstall = true)
+        assertNull(page)
+    }
+
+    @Test
+    fun whenNotFreshInstallSecondPageRequestedButDefaultBrowserNotCapableThenNoPageReturned() {
+        configureDeviceDoesNotSupportDefaultBrowser()
+        val page = testee.getItem(1, isFreshAppInstall = false)
         assertNull(page)
     }
 
+    @Test
+    fun whenDefaultBrowserSupportedThenFirstPageShowsContinueTextOnButton() {
+        configureDeviceSupportsDefaultBrowser()
+        val resourceId = testee.getContinueButtonTextResourceId(0, isFreshAppInstall = true)
+        assertEquals(R.string.onboardingContinue, resourceId)
+    }
+
+    @Test
+    fun whenFreshInstallDefaultBrowserNotSupportedThenFirstPageShowsFinalTextOnButton() {
+        configureDeviceDoesNotSupportDefaultBrowser()
+        val resourceId = testee.getContinueButtonTextResourceId(0, isFreshAppInstall = true)
+        assertEquals(R.string.onboardingContinueFinalPage, resourceId)
+    }
+
+    @Test
+    fun whenNotFreshInstallDefaultBrowserSupportedThenFirstPageShowsBackTextOnButton() {
+        configureDeviceSupportsDefaultBrowser()
+        val resourceId = testee.getContinueButtonTextResourceId(0, isFreshAppInstall = false)
+        assertEquals(R.string.onboardingBackButton, resourceId)
+    }
+
+    @Test
+    fun whenNotFreshInstallDefaultBrowserNotSupportedThenFirstPageShowsBackTextOnButton() {
+        configureDeviceDoesNotSupportDefaultBrowser()
+        val resourceId = testee.getContinueButtonTextResourceId(0, isFreshAppInstall = false)
+        assertEquals(R.string.onboardingBackButton, resourceId)
+    }
+
+    private fun configureDeviceSupportsDefaultBrowser() {
+        whenever(mockDefaultBrowserDetector.deviceSupportsDefaultBrowserConfiguration()).thenReturn(true)
+    }
+
+    private fun configureDeviceDoesNotSupportDefaultBrowser() {
+        whenever(mockDefaultBrowserDetector.deviceSupportsDefaultBrowserConfiguration()).thenReturn(false)
+    }
+
 }

app/src/main/AndroidManifest.xml

@@ -132,9 +132,6 @@
         <activity
             android:name="com.duckduckgo.app.bookmarks.ui.BookmarksActivity"
             android:label="@string/bookmarksActivityTitle" />
-        <activity
-            android:name=".defaultbrowsing.DefaultBrowserInfoActivity"
-            android:theme="@style/ModalCardTheme" />
         <activity
             android:name="com.duckduckgo.app.fire.FireActivity"
             android:process="@string/fireProcessName" />

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

@@ -503,11 +503,12 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope {
     }
 
     private fun showAuthenticationDialog(request: BasicAuthenticationRequest) {
-        val dialog = HttpAuthenticationDialogFragment.createHttpAuthenticationDialog(request.site)
-
-        dialog.show(activity?.supportFragmentManager, AUTHENTICATION_DIALOG_TAG)
-        dialog.listener = viewModel
-        dialog.request = request
+        activity?.supportFragmentManager?.let { fragmentManager ->
+            val dialog = HttpAuthenticationDialogFragment.createHttpAuthenticationDialog(request.site)
+            dialog.show(fragmentManager, AUTHENTICATION_DIALOG_TAG)
+            dialog.listener = viewModel
+            dialog.request = request
+        }
     }
 
     private fun saveBasicAuthCredentials(request: BasicAuthenticationRequest, credentials: BasicAuthenticationCredentials) {

app/src/main/java/com/duckduckgo/app/browser/defaultbrowsing/DefaultBrowserInfoActivity.kt

@@ -22,9 +22,9 @@ import android.webkit.CookieManager
 import com.duckduckgo.app.browser.*
 import com.duckduckgo.app.browser.addtohome.AddToHomeCapabilityDetector
 import com.duckduckgo.app.browser.addtohome.AddToHomeSystemCapabilityDetector
-import com.duckduckgo.app.browser.defaultbrowsing.DefaultBrowserObserver
 import com.duckduckgo.app.browser.defaultbrowsing.AndroidDefaultBrowserDetector
 import com.duckduckgo.app.browser.defaultbrowsing.DefaultBrowserDetector
+import com.duckduckgo.app.browser.defaultbrowsing.DefaultBrowserObserver
 import com.duckduckgo.app.browser.session.WebViewSessionInMemoryStorage
 import com.duckduckgo.app.browser.session.WebViewSessionStorage
 import com.duckduckgo.app.fire.DuckDuckGoCookieManager

app/src/main/java/com/duckduckgo/app/browser/di/BrowserModule.kt

@@ -21,7 +21,6 @@ import com.duckduckgo.app.bookmarks.ui.BookmarksActivity
 import com.duckduckgo.app.brokensite.BrokenSiteActivity
 import com.duckduckgo.app.browser.BrowserActivity
 import com.duckduckgo.app.browser.BrowserTabFragment
-import com.duckduckgo.app.browser.defaultbrowsing.DefaultBrowserInfoActivity
 import com.duckduckgo.app.browser.rating.ui.AppEnjoymentDialogFragment
 import com.duckduckgo.app.browser.rating.ui.GiveFeedbackDialogFragment
 import com.duckduckgo.app.browser.rating.ui.RateAppDialogFragment
@@ -111,10 +110,6 @@ abstract class AndroidBindingModule {
     @ContributesAndroidInjector
     abstract fun bookmarksActivity(): BookmarksActivity
 
-    @ActivityScoped
-    @ContributesAndroidInjector
-    abstract fun defaultBrowserInfoActivity(): DefaultBrowserInfoActivity
-
     @ActivityScoped
     @ContributesAndroidInjector
     abstract fun fireActivity(): FireActivity

app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt

@@ -20,12 +20,16 @@ import android.content.Context
 import com.duckduckgo.app.browser.WebDataManager
 import com.duckduckgo.app.entities.EntityMapping
 import com.duckduckgo.app.fire.*
+import com.duckduckgo.app.global.install.AppInstallStore
 import com.duckduckgo.app.global.view.ClearDataAction
 import com.duckduckgo.app.global.view.ClearPersonalDataAction
+import com.duckduckgo.app.privacy.HistoricTrackerBlockingObserver
 import com.duckduckgo.app.privacy.model.PrivacyPractices
 import com.duckduckgo.app.privacy.model.PrivacyPracticesImpl
+import com.duckduckgo.app.privacy.store.PrivacySettingsStore
 import com.duckduckgo.app.privacy.store.TermsOfServiceStore
 import com.duckduckgo.app.settings.db.SettingsDataStore
+import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.tabs.model.TabRepository
 import dagger.Module
 import dagger.Provides
@@ -65,4 +69,13 @@ class PrivacyModule {
     ): DataClearer {
         return AutomaticDataClearer(settingsDataStore, clearDataAction, dataClearerTimeKeeper)
     }
+
+    @Provides
+    @Singleton
+    fun historicTrackerBlockingObserver(
+        appInstallStore: AppInstallStore,
+        privacySettingsStore: PrivacySettingsStore,
+        pixel: Pixel
+    ): HistoricTrackerBlockingObserver =
+        HistoricTrackerBlockingObserver(appInstallStore, privacySettingsStore, pixel)
 }

app/src/main/java/com/duckduckgo/app/di/PrivacyModule.kt

@@ -44,6 +44,7 @@ import com.duckduckgo.app.httpsupgrade.HttpsUpgrader
 import com.duckduckgo.app.job.AppConfigurationSyncer
 import com.duckduckgo.app.notification.NotificationRegistrar
 import com.duckduckgo.app.notification.NotificationScheduler
+import com.duckduckgo.app.privacy.HistoricTrackerBlockingObserver
 import com.duckduckgo.app.settings.db.SettingsDataStore
 import com.duckduckgo.app.statistics.api.StatisticsUpdater
 import com.duckduckgo.app.statistics.pixels.Pixel
@@ -89,6 +90,9 @@ open class DuckDuckGoApplication : HasActivityInjector, HasServiceInjector, HasS
     @Inject
     lateinit var defaultBrowserObserver: DefaultBrowserObserver
 
+    @Inject
+    lateinit var historicTrackerBlockingObserver: HistoricTrackerBlockingObserver
+
     @Inject
     lateinit var statisticsUpdater: StatisticsUpdater
 
@@ -157,6 +161,7 @@ open class DuckDuckGoApplication : HasActivityInjector, HasServiceInjector, HasS
             it.addObserver(dataClearer)
             it.addObserver(appDaysUsedRecorder)
             it.addObserver(defaultBrowserObserver)
+            it.addObserver(historicTrackerBlockingObserver)
             it.addObserver(appEnjoymentLifecycleObserver)
         }