Merge branch 'release/5.78.0' into main

Author: malmstein

app/build.gradle

@@ -3,6 +3,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'com.squareup.anvil'
 apply from: '../versioning.gradle'
 apply from: "$rootDir/spotless.gradle"
 
@@ -11,15 +12,15 @@ ext {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion compile_sdk
     ndkVersion '21.0.6113669'
     defaultConfig {
         applicationId "com.duckduckgo.mobile.android"
-        minSdkVersion 21
-        targetSdkVersion 29
+        minSdkVersion min_sdk
+        targetSdkVersion target_sdk
         versionCode buildVersionCode()
         versionName buildVersionName()
-        testInstrumentationRunner "com.duckduckgo.app.TestRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         archivesBaseName = "duckduckgo-$versionName"
         vectorDrawables.useSupportLibrary = true
 
@@ -62,6 +63,22 @@ android {
             ]
         }
     }
+    flavorDimensions "store"
+    productFlavors {
+        fdroid{
+            dimension "store"
+        }
+        play{
+            dimension "store"
+        }
+    }
+    variantFilter { variant ->
+        def names = variant.flavors*.name
+        if (names.contains("fdroid") && variant.buildType.name == "debug") {
+            // We only need the F-Droid release version
+            setIgnore(true)
+        }
+    }
     externalNativeBuild {
 
         cmake {
@@ -96,6 +113,10 @@ android {
 }
 
 dependencies {
+    implementation project(path: ':statistics')
+    implementation project(path: ':common')
+    implementation project(path: ':di')
+
     implementation AndroidX.legacy.supportV4
     debugImplementation Square.leakCanary.android
 
@@ -161,10 +182,7 @@ dependencies {
     implementation AndroidX.work.rxJava2
 
     // Dagger
-    kapt Google.dagger.android.processor
     kapt Google.dagger.compiler
-    kaptAndroidTest "com.google.dagger:dagger-android-processor:_"
-    kaptAndroidTest "com.google.dagger:dagger-compiler:_"
 
     // Glide
     implementation "com.github.bumptech.glide:glide:_"
@@ -174,11 +192,8 @@ dependencies {
     // Lottie
     implementation "com.airbnb.android:lottie:_"
 
-    // Apache commons
-    implementation "org.apache.commons:commons-math3:_"
-
     // Play Store referrer library
-    implementation("com.android.installreferrer:installreferrer:_")
+    playImplementation("com.android.installreferrer:installreferrer:_")
 
     // Testing dependencies
     androidTestImplementation AndroidX.test.runner

app/src/androidTest/java/com/duckduckgo/app/TestApplication.kt

@@ -20,7 +20,8 @@ import androidx.annotation.UiThread
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
 import androidx.test.platform.app.InstrumentationRegistry
-import com.duckduckgo.app.di.TestAppComponent
+import com.duckduckgo.app.di.AppComponent
+import com.duckduckgo.app.global.DuckDuckGoApplication
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 
@@ -38,10 +39,10 @@ fun <T> LiveData<T>.blockingObserve(): T? {
     return value
 }
 
-fun getApp(): TestApplication {
-    return InstrumentationRegistry.getInstrumentation().targetContext.applicationContext as TestApplication
+fun getApp(): DuckDuckGoApplication {
+    return InstrumentationRegistry.getInstrumentation().targetContext.applicationContext as DuckDuckGoApplication
 }
 
-fun getDaggerComponent(): TestAppComponent {
-    return getApp().daggerAppComponent as TestAppComponent
+fun getDaggerComponent(): AppComponent {
+    return getApp().daggerAppComponent as AppComponent
 }

app/src/androidTest/java/com/duckduckgo/app/TestExtensions.kt

@@ -19,7 +19,6 @@ package com.duckduckgo.app.browser
 import android.content.Context
 import android.webkit.WebStorage
 import android.webkit.WebView
-import android.webkit.WebViewDatabase
 import androidx.test.platform.app.InstrumentationRegistry
 import com.duckduckgo.app.browser.httpauth.WebViewHttpAuthStore
 import com.duckduckgo.app.browser.session.WebViewSessionInMemoryStorage
@@ -40,7 +39,6 @@ class WebViewDataManagerTest {
     private val mockStorage: WebStorage = mock()
     private val context = InstrumentationRegistry.getInstrumentation().targetContext
     private val mockFileDeleter: FileDeleter = mock()
-    private val mockWebViewDatabase: WebViewDatabase = mock()
     private val mockWebViewHttpAuthStore: WebViewHttpAuthStore = mock()
     private val testee = WebViewDataManager(context, WebViewSessionInMemoryStorage(), mockCookieManager, mockFileDeleter, mockWebViewHttpAuthStore)
 
@@ -89,6 +87,15 @@ class WebViewDataManagerTest {
         }
     }
 
+    @Test
+    fun whenDataClearedThenHttpAuthDatabaseCleaned() = runBlocking<Unit> {
+        withContext(Dispatchers.Main) {
+            val webView = TestWebView(context)
+            testee.clearData(webView, mockStorage)
+            verify(mockWebViewHttpAuthStore).cleanHttpAuthDatabase()
+        }
+    }
+
     @Test
     fun whenDataClearedThenWebViewCookiesRemoved() = runBlocking<Unit> {
         withContext(Dispatchers.Main) {

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

@@ -19,8 +19,13 @@ package com.duckduckgo.app.browser.httpauth
 import android.webkit.WebView
 import android.webkit.WebViewDatabase
 import androidx.test.filters.SdkSuppress
+import androidx.test.platform.app.InstrumentationRegistry
 import com.duckduckgo.app.CoroutineTestRule
+import com.duckduckgo.app.fire.AuthDatabaseLocator
+import com.duckduckgo.app.fire.DatabaseCleaner
+import com.duckduckgo.app.runBlocking
 import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.never
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -32,13 +37,15 @@ import org.junit.Test
 class WebViewHttpAuthStoreTest {
 
     @get:Rule
-    @Suppress("unused")
     val coroutineRule = CoroutineTestRule()
 
+    private val context = InstrumentationRegistry.getInstrumentation().targetContext
     private val webViewDatabase: WebViewDatabase = mock()
+    private val mockDatabaseCleaner: DatabaseCleaner = mock()
     private val webView: WebView = mock()
+    private val databaseLocator = AuthDatabaseLocator(context)
 
-    private val webViewHttpAuthStore = RealWebViewHttpAuthStore(webViewDatabase)
+    private val webViewHttpAuthStore = RealWebViewHttpAuthStore(webViewDatabase, mockDatabaseCleaner, databaseLocator, coroutineRule.testDispatcherProvider)
 
     @Test
     @SdkSuppress(minSdkVersion = android.os.Build.VERSION_CODES.O)
@@ -89,4 +96,31 @@ class WebViewHttpAuthStoreTest {
 
         assertEquals(WebViewHttpAuthCredentials("name", "pass"), credentials)
     }
+
+    @Test
+    fun whenCleanHttpAuthDatabaseThenCleanDatabaseCalled() = coroutineRule.runBlocking {
+        webViewHttpAuthStore.cleanHttpAuthDatabase()
+        verify(mockDatabaseCleaner).cleanDatabase(databaseLocator.getDatabasePath())
+    }
+
+    @Test
+    @SdkSuppress(minSdkVersion = android.os.Build.VERSION_CODES.LOLLIPOP, maxSdkVersion = android.os.Build.VERSION_CODES.O_MR1)
+    fun whenAppCreatedAndApiBetween21And27ThenJournalModeChangedToDelete() = coroutineRule.runBlocking {
+        webViewHttpAuthStore.onAppCreated()
+        verify(mockDatabaseCleaner).changeJournalModeToDelete(databaseLocator.getDatabasePath())
+    }
+
+    @Test
+    @SdkSuppress(minSdkVersion = android.os.Build.VERSION_CODES.Q)
+    fun whenAppCreatedAndApiGreaterThan28ThenJournalModeChangedToDelete() = coroutineRule.runBlocking {
+        webViewHttpAuthStore.onAppCreated()
+        verify(mockDatabaseCleaner).changeJournalModeToDelete(databaseLocator.getDatabasePath())
+    }
+
+    @Test
+    @SdkSuppress(minSdkVersion = android.os.Build.VERSION_CODES.P, maxSdkVersion = android.os.Build.VERSION_CODES.P)
+    fun whenAppCreatedAndApiIs28ThenJournalModeChangedToDeleteNotCalled() = coroutineRule.runBlocking {
+        webViewHttpAuthStore.onAppCreated()
+        verify(mockDatabaseCleaner, never()).changeJournalModeToDelete(databaseLocator.getDatabasePath())
+    }
 }

app/src/androidTest/java/com/duckduckgo/app/browser/httpauth/WebViewHttpAuthStoreTest.kt

@@ -17,11 +17,17 @@
 package com.duckduckgo.app.di
 
 import com.duckduckgo.app.job.ConfigurationDownloader
+import com.duckduckgo.di.scopes.AppObjectGraph
+import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
 import io.reactivex.Completable
 
 @Module
+@ContributesTo(
+    scope = AppObjectGraph::class,
+    replaces = [AppConfigurationDownloaderModule::class]
+)
 class StubAppConfigurationDownloadModule {
 
     @Provides

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

@@ -19,14 +19,23 @@ package com.duckduckgo.app.di
 import android.content.Context
 import android.webkit.WebViewDatabase
 import androidx.room.Room
+import com.duckduckgo.app.CoroutineTestRule
 import com.duckduckgo.app.browser.httpauth.RealWebViewHttpAuthStore
 import com.duckduckgo.app.browser.httpauth.WebViewHttpAuthStore
+import com.duckduckgo.app.fire.DatabaseCleanerHelper
+import com.duckduckgo.app.fire.AuthDatabaseLocator
 import com.duckduckgo.app.global.db.AppDatabase
+import com.duckduckgo.di.scopes.AppObjectGraph
+import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
 import javax.inject.Singleton
 
 @Module(includes = [DaoModule::class])
+@ContributesTo(
+    scope = AppObjectGraph::class,
+    replaces = [DatabaseModule::class]
+)
 class StubDatabaseModule {
 
     @Provides
@@ -40,8 +49,8 @@ class StubDatabaseModule {
     @Provides
     @Singleton
     fun provideWebViewHttpAuthStore(
-        context: Context,
+        context: Context
     ): WebViewHttpAuthStore {
-        return RealWebViewHttpAuthStore(WebViewDatabase.getInstance(context))
+        return RealWebViewHttpAuthStore(WebViewDatabase.getInstance(context), DatabaseCleanerHelper(), AuthDatabaseLocator(context), CoroutineTestRule().testDispatcherProvider)
     }
 }

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

@@ -25,11 +25,17 @@ import com.duckduckgo.app.job.AndroidWorkScheduler
 import com.duckduckgo.app.job.JobCleaner
 import com.duckduckgo.app.job.WorkScheduler
 import com.duckduckgo.app.notification.AndroidNotificationScheduler
+import com.duckduckgo.di.scopes.AppObjectGraph
+import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
 import javax.inject.Singleton
 
 @Module
+@ContributesTo(
+    scope = AppObjectGraph::class,
+    replaces = [JobsModule::class]
+)
 class StubJobSchedulerModule {
 
     @Singleton

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

@@ -19,20 +19,26 @@ package com.duckduckgo.app.di
 import android.content.Context
 import com.duckduckgo.app.global.device.ContextDeviceInfo
 import com.duckduckgo.app.global.device.DeviceInfo
-import com.duckduckgo.app.referral.AppInstallationReferrerStateListener
 import com.duckduckgo.app.statistics.AtbInitializer
+import com.duckduckgo.app.statistics.AtbInitializerListener
 import com.duckduckgo.app.statistics.api.PixelSender
 import com.duckduckgo.app.statistics.api.StatisticsService
 import com.duckduckgo.app.statistics.api.StatisticsUpdater
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.statistics.store.StatisticsDataStore
+import com.duckduckgo.di.scopes.AppObjectGraph
+import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
 import io.reactivex.Completable
 import retrofit2.Retrofit
 import javax.inject.Singleton
 
 @Module
+@ContributesTo(
+    scope = AppObjectGraph::class,
+    replaces = [StatisticsModule::class]
+)
 class StubStatisticsModule {
 
     @Provides
@@ -84,9 +90,9 @@ class StubStatisticsModule {
     fun atbInitializer(
         statisticsDataStore: StatisticsDataStore,
         statisticsUpdater: StatisticsUpdater,
-        appReferrerStateListener: AppInstallationReferrerStateListener
+        listeners: Set<@JvmSuppressWildcards AtbInitializerListener>
     ): AtbInitializer {
-        return AtbInitializer(statisticsDataStore, statisticsUpdater, appReferrerStateListener)
+        return AtbInitializer(statisticsDataStore, statisticsUpdater, listeners)
     }
 
     @Provides