Merge branch 'release/5.197.0'

duckduckgo · Apr 22, 2024 · 9050b84 · 9050b84
2 parents 9302f34 + 4535e2e
commit 9050b84
Show file tree

Hide file tree

Showing 374 changed files with 12,903 additions and 10,024 deletions.
diff --git a/.githooks/pre-commit b/.githooks/pre-commit
diff --git a/.github/workflows/e2e-nightly-autofill.yml b/.github/workflows/e2e-nightly-autofill.yml
@@ -59,7 +59,7 @@ jobs:
           api-key: ${{ secrets.MOBILE_DEV_API_KEY }}
           name: ${{ github.sha }}
           app-file: apk/release.apk
-          android-api-level: 30
+          android-api-level: 33
           workspace: .maestro
           include-tags: autofillNoAuthTests
 

diff --git a/.maestro/security_tests/3_-_AddressBarSpoof,_appschemes.yaml b/.maestro/security_tests/3_-_AddressBarSpoof,_appschemes.yaml
@@ -12,13 +12,11 @@ tags:
 - pressKey: Enter
 - tapOn: "Got It"
 - tapOn: "Start"
-- tapOn: "Phew!"
-# This test should reject trying to load
-# This test is expected to load duckduckgo.com, not remain on the current page with spoofed content.
-- assertVisible: "Privacy, simplified." # DuckDuckGo home page
+# This test is expected to load spreadprivacy.com, not remain on the current page with spoofed content.
+- assertVisible: "Spread Privacy" # DuckDuckGo blog homepage
 - copyTextFrom:
     id: "omnibarTextInput"
-- assertTrue: ${maestro.copiedText == "https://duckduckgo.com/"} # DuckDuckGo home page
+- assertTrue: ${maestro.copiedText == "https://spreadprivacy.com/"} # DuckDuckGo blog home page
 - tapOn:
     id: "omnibarTextInput"
 # Test 2
@@ -27,4 +25,4 @@ tags:
 - tapOn: "Start"
 - copyTextFrom:
     id: "omnibarTextInput"
-- assertTrue: ${maestro.copiedText == "https://privacy-test-pages.site/security/address-bar-spoofing/spoof-unsupported-scheme.html"}
+- assertTrue: ${maestro.copiedText == "https://privacy-test-pages.site/security/address-bar-spoofing/spoof-unsupported-scheme.html"}
diff --git a/ad-click/ad-click-impl/build.gradle b/ad-click/ad-click-impl/build.gradle
@@ -92,4 +92,6 @@ dependencies {
     testImplementation Testing.robolectric
 
     testImplementation project(path: ':common-test')
+
+    coreLibraryDesugaring Android.tools.desugarJdkLibs
 }
diff --git a/ad-click/ad-click-store/build.gradle b/ad-click/ad-click-store/build.gradle
@@ -61,4 +61,6 @@ dependencies {
     testImplementation 'app.cash.turbine:turbine:_'
     testImplementation Testing.robolectric
     testImplementation project(path: ':common-test')
+
+    coreLibraryDesugaring Android.tools.desugarJdkLibs
 }
diff --git a/anrs/anrs-impl/build.gradle b/anrs/anrs-impl/build.gradle
@@ -48,6 +48,8 @@ dependencies {
     testImplementation AndroidX.test.ext.junit
     testImplementation "org.mockito.kotlin:mockito-kotlin:_"
     testImplementation Testing.robolectric
+
+    coreLibraryDesugaring Android.tools.desugarJdkLibs
 }
 
 android {

diff --git a/anrs/anrs-impl/src/main/java/com/duckduckgo/app/anr/GlobalUncaughtExceptionHandler.kt b/anrs/anrs-impl/src/main/java/com/duckduckgo/app/anr/GlobalUncaughtExceptionHandler.kt
@@ -46,9 +46,11 @@ class GlobalUncaughtExceptionHandler @Inject constructor(
         thread: Thread?,
         originalException: Throwable?,
     ) {
-        if (shouldRecordExceptionAndCrashApp(originalException)) {
-            recordExceptionAndAllowCrash(thread, originalException)
-            return
+        runCatching {
+            if (shouldRecordExceptionAndCrashApp(originalException)) {
+                recordExceptionAndAllowCrash(thread, originalException)
+                return
+            }
         }
     }
 

diff --git a/app-store/build.gradle b/app-store/build.gradle
@@ -29,6 +29,8 @@ dependencies {
     implementation AndroidX.room.runtime
 
     ksp AndroidX.room.compiler
+
+    coreLibraryDesugaring Android.tools.desugarJdkLibs
 }
 android {
   namespace 'com.duckduckgo.app'

diff --git a/app-tracking-protection/vpn-impl/build.gradle b/app-tracking-protection/vpn-impl/build.gradle
@@ -136,4 +136,6 @@ dependencies {
     testImplementation project(':common-test')
     testImplementation project(':vpn-api-test')
     testImplementation project(':feature-toggles-test')
+
+    coreLibraryDesugaring Android.tools.desugarJdkLibs
 }
diff --git a/...protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/cohort/CohortStore.kt b/...protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/cohort/CohortStore.kt
@@ -97,12 +97,13 @@ class RealCohortStore @Inject constructor(
 
     override fun onVpnStarted(coroutineScope: CoroutineScope) {
         coroutineScope.launch(dispatcherProvider.io()) {
-            if (vpnFeaturesRegistry.isFeatureRegistered(AppTpVpnFeature.APPTP_VPN)) {
-                // skip if already stored
-                getCohortStoredLocalDate()?.let { return@launch }
+            attemptAssignCohort()
+        }
+    }
 
-                setCohortLocalDate(LocalDate.now())
-            }
+    override fun onVpnReconfigured(coroutineScope: CoroutineScope) {
+        coroutineScope.launch(dispatcherProvider.io()) {
+            attemptAssignCohort()
         }
     }
 
@@ -113,6 +114,15 @@ class RealCohortStore @Inject constructor(
         // noop
     }
 
+    private suspend fun attemptAssignCohort() {
+        if (vpnFeaturesRegistry.isFeatureRegistered(AppTpVpnFeature.APPTP_VPN)) {
+            // skip if already stored
+            getCohortStoredLocalDate()?.let { return }
+
+            setCohortLocalDate(LocalDate.now())
+        }
+    }
+
     companion object {
         private const val FILENAME = "com.duckduckgo.mobile.atp.cohort.prefs"
         private const val KEY_COHORT_LOCAL_DATE = "KEY_COHORT_LOCAL_DATE"

diff --git a/...on/vpn-impl/src/test/java/com/duckduckgo/mobile/android/vpn/cohort/RealCohortStoreTest.kt b/...on/vpn-impl/src/test/java/com/duckduckgo/mobile/android/vpn/cohort/RealCohortStoreTest.kt
@@ -103,4 +103,12 @@ class RealCohortStoreTest {
 
         assertNull(cohortStore.getCohortStoredLocalDate())
     }
+
+    @Test
+    fun whenVpnReconfiguredCalledThenStoreInitialCohort() = runTest {
+        vpnFeaturesRegistry.registerFeature(AppTpVpnFeature.APPTP_VPN)
+        (cohortStore as RealCohortStore).onVpnReconfigured(TestScope())
+
+        assertEquals(LocalDate.now(), cohortStore.getCohortStoredLocalDate())
+    }
 }
diff --git a/...-internal/src/main/java/com/duckduckgo/vpn/internal/feature/VpnInternalSettingsFeature.kt b/...-internal/src/main/java/com/duckduckgo/vpn/internal/feature/VpnInternalSettingsFeature.kt
@@ -17,13 +17,15 @@
 package com.duckduckgo.vpn.internal.feature
 
 import android.content.Context
+import com.duckduckgo.anvil.annotations.PriorityKey
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.internal.features.api.InternalFeaturePlugin
 import com.duckduckgo.navigation.api.GlobalActivityStarter
 import com.squareup.anvil.annotations.ContributesMultibinding
 import javax.inject.Inject
 
 @ContributesMultibinding(AppScope::class)
+@PriorityKey(InternalFeaturePlugin.APPTP_SETTINGS_PRIO_KEY)
 class VpnInternalSettingsFeature @Inject constructor(
     private val globalActivityStarter: GlobalActivityStarter,
 ) : InternalFeaturePlugin {

diff --git a/app-tracking-protection/vpn-store/build.gradle b/app-tracking-protection/vpn-store/build.gradle
@@ -79,4 +79,6 @@ dependencies {
     testImplementation AndroidX.test.ext.junit
 
     androidTestUtil AndroidX.test.orchestrator
+
+    coreLibraryDesugaring Android.tools.desugarJdkLibs
 }
diff --git a/app/build.gradle b/app/build.gradle
@@ -72,8 +72,15 @@ android {
     ksp {
         arg("room.generateKotlin", "true")
     }
+
     signingConfigs {
         release
+        debug {
+            keyAlias 'android'
+            keyPassword 'pwpwpw'
+            storeFile file('debug-dummy.keystore')
+            storePassword 'pwpwpw'
+        }
     }
     buildTypes {
         debug {

diff --git a/app/debug-dummy.keystore b/app/debug-dummy.keystore