Merge branch 'release/5.201.0' into main

Author: daxtheduck

.github/workflows/custom-tabs-nightly.yml

@@ -0,0 +1,76 @@
+name: Custom Tabs nightly tests
+
+on:
+  schedule:
+    - cron: '0 5 * * *' # run at 5 AM UTC
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  instrumentation_tests:
+    runs-on: ubuntu-latest
+    name: Custom Tabs nightly tests
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+
+      - name: Create folder
+        if: always()
+        run: mkdir apk
+
+      - name: Decode keys
+        uses: davidSchuppa/base64Secret-toFile-action@v2
+        with:
+          secret: ${{ secrets.FAKE_RELEASE_PROPERTIES }}
+          fileName: ddg_android_build.properties
+          destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/
+
+      - name: Decode key file
+        uses: davidSchuppa/base64Secret-toFile-action@v2
+        with:
+          secret: ${{ secrets.FAKE_RELEASE_KEY }}
+          fileName: android
+          destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/
+
+      - name: Assemble internal release APK
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: assembleInternalRelease -Pforce-default-variant -x lint
+
+      - name: Move APK to new folder
+        if: always()
+        run: find . -name "*.apk"  -exec mv '{}' apk/release.apk \;
+
+      - name: Custom Tabs Flows
+        uses: mobile-dev-inc/[email protected]
+        with:
+          api-key: ${{ secrets.MOBILE_DEV_API_KEY }}
+          name: ${{ github.sha }}
+          app-file: apk/release.apk
+          android-api-level: 30
+          workspace: .maestro
+          include-tags: customTabsTest
+
+      - name: Create Asana task when workflow failed
+        if: ${{ failure() }}
+        id: create-failure-task
+        uses: duckduckgo/[email protected]
+        with:
+          asana-pat: ${{ secrets.GH_ASANA_SECRET }}
+          asana-project: ${{ vars.GH_ANDROID_APP_PROJECT_ID }}
+          asana-section: ${{ vars.GH_ANDROID_APP_INCOMING_SECTION_ID }}
+          asana-task-name: GH Workflow Failure - Custom Tabs Flows
+          asana-task-description: The Custom Tabs nightly workflow has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }}
+          action: 'create-asana-task'

.maestro/bookmarks/open_bookmark_and_navigate_back.yaml

@@ -45,6 +45,6 @@ tags:
       text: "Privacy Test Pages - Home"
 - assertVisible:
       text: "Privacy Test Pages"
-- tapOn: "back"
+- action: back
 - assertVisible:
       text: "Search engine"

.maestro/bookmarks/open_bookmark_in_folder_and_navigate_back.yaml

@@ -157,6 +157,6 @@ tags:
     text: "Privacy Test Pages - Home"
 - assertVisible:
     text: "Privacy Test Pages"
-- tapOn: "back"
+- action: back
 - assertVisible:
     text: "Search engine"

.maestro/custom_tabs/custom_tabs_navigation.yaml

@@ -0,0 +1,64 @@
+appId: com.duckduckgo.mobile.android
+name: "Custom Tabs navigation"
+tags:
+  - customTabsTest
+---
+- launchApp:
+    clearState: true
+    stopApp: true
+
+- assertVisible:
+    text: ".*Not to worry! Searching and browsing privately.*"
+- tapOn: "let's do it!"
+- runFlow:
+    when:
+      visible: "set as default"
+    commands:
+      - tapOn: "duckduckgo"
+      - tapOn: "set as default"
+      - assertVisible:
+          text: ".*I'll also upgrade the security of your connection if possible.*"
+
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/browserMenuImageView"
+- tapOn:
+    text: "settings"
+- scrollUntilVisible:
+    element:
+      text: "developer settings"
+    direction: DOWN
+- tapOn:
+    text: "developer settings"
+- scrollUntilVisible:
+    element:
+      text: "custom tabs"
+    direction: DOWN
+- tapOn:
+    text: "custom tabs"
+- tapOn:
+    text: "add your url here"
+- inputText: "https://www.search-company.site"
+- tapOn:
+    text: "load custom tab"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/browserMenuImageView"
+- assertVisible:
+    text: "running in duckduckgo"
+- action: back
+- tapOn:
+    text: "[Ad 1] SERP Ad (heuristic)"
+- action: back
+- tapOn:
+    text: "[Ad 1] SERP Ad (heuristic)"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/browserMenuImageView"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/backMenuItem"
+- assertVisible:
+    text: "Search engine"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/browserMenuImageView"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/forwardMenuItem"
+- assertVisible:
+    text: "Publisher site"

.maestro/custom_tabs/custom_tabs_navigation_new_tab.yaml

@@ -0,0 +1,70 @@
+appId: com.duckduckgo.mobile.android
+name: "Custom Tabs navigation in new tab"
+tags:
+  - customTabsTest
+---
+- launchApp:
+    clearState: true
+    stopApp: true
+
+- assertVisible:
+    text: ".*Not to worry! Searching and browsing privately.*"
+- tapOn: "let's do it!"
+- runFlow:
+    when:
+      visible: "set as default"
+    commands:
+      - tapOn: "duckduckgo"
+      - tapOn: "set as default"
+      - assertVisible:
+          text: ".*I'll also upgrade the security of your connection if possible.*"
+
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/browserMenuImageView"
+- tapOn:
+    text: "settings"
+- scrollUntilVisible:
+    element:
+      text: "developer settings"
+    direction: DOWN
+- tapOn:
+    text: "developer settings"
+- scrollUntilVisible:
+    element:
+      text: "custom tabs"
+    direction: DOWN
+- tapOn:
+    text: "custom tabs"
+- tapOn:
+    text: "add your url here"
+- inputText: "https://www.search-company.site"
+- tapOn:
+    text: "load custom tab"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/browserMenuImageView"
+- assertVisible:
+    text: "running in duckduckgo"
+- action: back
+- tapOn:
+    text: "[Ad 2] Shopping Tab Ad (heuristic)"
+- assertVisible:
+    text: "Publisher site"
+- action: back
+- tapOn:
+    text: "[Ad 2] Shopping Tab Ad (heuristic)"
+- tapOn:
+    text: "Red shoes"
+- assertVisible:
+    text: "Checkout"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/browserMenuImageView"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/backMenuItem"
+- assertVisible:
+    text: "Red shoes"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/browserMenuImageView"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/forwardMenuItem"
+- assertVisible:
+    text: "Checkout"

app-tracking-protection/vpn-impl/build.gradle

@@ -64,6 +64,7 @@ dependencies {
     implementation project(':statistics')
     implementation project(':library-loader-api')
     implementation project(':network-protection-api')
+    implementation project(':data-store-api')
 
     implementation AndroidX.core.ktx
 
@@ -80,10 +81,6 @@ dependencies {
 
     // multi-process shared preferences
     implementation "com.frybits.harmony:harmony:_"
-    implementation 'com.frybits.harmony:harmony-crypto:_'
-
-    // Security crypto
-    implementation AndroidX.security.crypto
 
     // Lottie
     implementation "com.airbnb.android:lottie:_"

app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/VpnFeaturesRegistryImpl.kt

@@ -20,7 +20,7 @@ import android.content.Context
 import android.content.SharedPreferences
 import androidx.core.content.edit
 import com.duckduckgo.common.utils.DispatcherProvider
-import com.duckduckgo.mobile.android.vpn.prefs.VpnSharedPreferencesProvider
+import com.duckduckgo.data.store.api.SharedPreferencesProvider
 import com.duckduckgo.mobile.android.vpn.service.TrackerBlockingVpnService
 import java.util.UUID
 import kotlinx.coroutines.sync.Mutex
@@ -32,7 +32,7 @@ private const val IS_INITIALIZED = "IS_INITIALIZED"
 
 internal class VpnFeaturesRegistryImpl(
     private val vpnServiceWrapper: VpnServiceWrapper,
-    private val sharedPreferencesProvider: VpnSharedPreferencesProvider,
+    private val sharedPreferencesProvider: SharedPreferencesProvider,
     private val dispatcherProvider: DispatcherProvider,
 ) : VpnFeaturesRegistry {
 

app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/bugreport/NetworkTypeCollector.kt

@@ -18,7 +18,6 @@ package com.duckduckgo.mobile.android.vpn.bugreport
 
 import android.content.Context
 import android.content.SharedPreferences
-import android.net.*
 import android.os.SystemClock
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.ActivityScope

app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/cohort/CohortStore.kt

@@ -23,11 +23,11 @@ import com.duckduckgo.appbuildconfig.api.AppBuildConfig
 import com.duckduckgo.appbuildconfig.api.isInternalBuild
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.common.utils.checkMainThread
+import com.duckduckgo.data.store.api.SharedPreferencesProvider
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.di.scopes.VpnScope
 import com.duckduckgo.mobile.android.vpn.AppTpVpnFeature
 import com.duckduckgo.mobile.android.vpn.VpnFeaturesRegistry
-import com.duckduckgo.mobile.android.vpn.prefs.VpnSharedPreferencesProvider
 import com.duckduckgo.mobile.android.vpn.service.VpnServiceCallbacks
 import com.duckduckgo.mobile.android.vpn.state.VpnStateMonitor.VpnStopReason
 import com.squareup.anvil.annotations.ContributesBinding
@@ -61,7 +61,7 @@ interface CohortStore {
     boundType = VpnServiceCallbacks::class,
 )
 class RealCohortStore @Inject constructor(
-    private val sharedPreferencesProvider: VpnSharedPreferencesProvider,
+    private val sharedPreferencesProvider: SharedPreferencesProvider,
     private val vpnFeaturesRegistry: VpnFeaturesRegistry,
     private val dispatcherProvider: DispatcherProvider,
     private val appBuildConfig: AppBuildConfig,

app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/di/VpnAppModule.kt

@@ -21,12 +21,12 @@ import android.content.res.Resources
 import android.net.ConnectivityManager
 import androidx.room.Room
 import com.duckduckgo.common.utils.DispatcherProvider
+import com.duckduckgo.data.store.api.SharedPreferencesProvider
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.mobile.android.vpn.Vpn
 import com.duckduckgo.mobile.android.vpn.VpnFeaturesRegistry
 import com.duckduckgo.mobile.android.vpn.VpnFeaturesRegistryImpl
 import com.duckduckgo.mobile.android.vpn.VpnServiceWrapper
-import com.duckduckgo.mobile.android.vpn.prefs.VpnSharedPreferencesProvider
 import com.duckduckgo.mobile.android.vpn.stats.AppTrackerBlockingStatsRepository
 import com.duckduckgo.mobile.android.vpn.stats.RealAppTrackerBlockingStatsRepository
 import com.duckduckgo.mobile.android.vpn.store.*
@@ -92,7 +92,7 @@ object VpnAppModule {
     @SingleInstanceIn(AppScope::class)
     fun provideVpnFeaturesRegistry(
         context: Context,
-        sharedPreferencesProvider: VpnSharedPreferencesProvider,
+        sharedPreferencesProvider: SharedPreferencesProvider,
         dispatcherProvider: DispatcherProvider,
     ): VpnFeaturesRegistry {
         return VpnFeaturesRegistryImpl(VpnServiceWrapper(context, dispatcherProvider), sharedPreferencesProvider, dispatcherProvider)