Merge branch 'release/5.222.0'

duckduckgo · Dec 12, 2024 · 0f7a163 · 0f7a163
2 parents 6551330 + a0c4232
commit 0f7a163
Show file tree

Hide file tree

Showing 274 changed files with 15,279 additions and 6,363 deletions.
diff --git a/.github/workflows/end-to-end-robintest.yml b/.github/workflows/end-to-end-robintest.yml
@@ -0,0 +1,118 @@
+name: End-to-End tests (Robin)
+
+on:
+  schedule:
+    - cron: '0 3 * * *' # run at 3 AM UTC
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  instrumentation_tests:
+    runs-on: ubuntu-latest
+    name: End-to-End tests
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        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: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Assemble release APK
+        run: ./gradlew assemblePlayRelease -Pforce-default-variant
+
+      - name: Move APK to new folder
+        if: always()
+        run: find . -name "*.apk"  -exec mv '{}' apk/release.apk \;
+
+      - name: Ad click detection flows
+        uses: mobile-dev-inc/[email protected]
+        with:
+          api-key: ${{ secrets.ROBIN_API_KEY }}
+          project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
+          name: adClickTest_${{ github.sha }}
+          timeout: 120
+          app-file: apk/release.apk
+          android-api-level: 30
+          workspace: .maestro
+          include-tags: adClickTest
+
+      - name: Privacy Tests
+        if: always()
+        uses: mobile-dev-inc/[email protected]
+        with:
+          api-key: ${{ secrets.ROBIN_API_KEY }}
+          project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
+          name: privacyTest_${{ github.sha }}
+          timeout: 120
+          app-file: apk/release.apk
+          android-api-level: 30
+          workspace: .maestro
+          include-tags: privacyTest
+
+      - name: Security Tests
+        if: always()
+        uses: mobile-dev-inc/[email protected]
+        with:
+          api-key: ${{ secrets.ROBIN_API_KEY }}
+          project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
+          name: securityTest_${{ github.sha }}
+          timeout: 120
+          app-file: apk/release.apk
+          android-api-level: 30
+          workspace: .maestro
+          include-tags: securityTest
+
+      - name: Release Tests
+        if: always()
+        uses: mobile-dev-inc/[email protected]
+        with:
+          api-key: ${{ secrets.ROBIN_API_KEY }}
+          project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
+          name: releaseTest_${{ github.sha }}
+          timeout: 120
+          app-file: apk/release.apk
+          android-api-level: 30
+          workspace: .maestro
+          include-tags: releaseTest
+
+      - name: Notifications permissions Android 13+
+        if: always()
+        uses: mobile-dev-inc/[email protected]
+        with:
+          api-key: ${{ secrets.ROBIN_API_KEY }}
+          project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
+          name: notificationPermissionTest_${{ github.sha }}
+          timeout: 120
+          app-file: apk/release.apk
+          android-api-level: 33
+          workspace: .maestro/notifications_permissions_android13_plus
diff --git a/...vided_but_incorrect_(dsl_not_needed).yaml → ...rovided_but_incorrect_dsl_not_needed.yaml b/...vided_but_incorrect_(dsl_not_needed).yaml → ...rovided_but_incorrect_dsl_not_needed.yaml
diff --git a/...omain_(i.e.,_abcedf)_(u3_not_needed).yaml → ..._a_domain_i.e.,_abcedf_u3_not_needed.yaml b/...omain_(i.e.,_abcedf)_(u3_not_needed).yaml → ..._a_domain_i.e.,_abcedf_u3_not_needed.yaml
diff --git a/...ain_(i.e.,_abcedf)__(dsl_not_needed).yaml → ..._domain_i.e.,_abcedf__dsl_not_needed.yaml b/...ain_(i.e.,_abcedf)__(dsl_not_needed).yaml → ..._domain_i.e.,_abcedf__dsl_not_needed.yaml
diff --git a/...search-company-site)_(u3_not_needed).yaml → ...ww.search-company-site_u3_not_needed.yaml b/...search-company-site)_(u3_not_needed).yaml → ...ww.search-company-site_u3_not_needed.yaml
diff --git a/...arch-company-site)__(dsl_not_needed).yaml → ....search-company-site__dsl_not_needed.yaml b/...arch-company-site)__(dsl_not_needed).yaml → ....search-company-site__dsl_not_needed.yaml
diff --git a/...o_ad_domain_param;_u3_param_included.yaml → ...domain_param_u3_param_included_1_1_1.yaml b/...o_ad_domain_param;_u3_param_included.yaml → ...domain_param_u3_param_included_1_1_1.yaml
diff --git a/..._ad_domain_param;_dsl_param_included.yaml → ..._domain_param_dsl_param_included_1_1.yaml b/..._ad_domain_param;_dsl_param_included.yaml → ..._domain_param_dsl_param_included_1_1.yaml
diff --git a/...d_domain_param,_but_missing_u3_param.yaml → ...main_param,_but_missing_u3_param_1_1.yaml b/...d_domain_param,_but_missing_u3_param.yaml → ...main_param,_but_missing_u3_param_1_1.yaml
diff --git a/..._domain_param,_but_missing_dsl_param.yaml → ...ain_param,_but_missing_dsl_param_1_1.yaml b/..._domain_param,_but_missing_dsl_param.yaml → ...ain_param,_but_missing_dsl_param_1_1.yaml
diff --git a/..._provided,_but_empty_(u3_not_needed).yaml → ...in_provided,_but_empty_u3_not_needed.yaml b/..._provided,_but_empty_(u3_not_needed).yaml → ...in_provided,_but_empty_u3_not_needed.yaml
diff --git a/...provided,_but_empty_(dsl_not_needed).yaml → ...n_provided,_but_empty_dsl_not_needed.yaml b/...provided,_but_empty_(dsl_not_needed).yaml → ...n_provided,_but_empty_dsl_not_needed.yaml
diff --git a/...;_ad_domain_provided_(u3_not_needed).yaml → ...ded_ad_domain_provided_u3_not_needed.yaml b/...;_ad_domain_provided_(u3_not_needed).yaml → ...ded_ad_domain_provided_u3_not_needed.yaml
diff --git a/..._ad_domain_provided_(dsl_not_needed).yaml → ...ed_ad_domain_provided_dsl_not_needed.yaml b/..._ad_domain_provided_(dsl_not_needed).yaml → ...ed_ad_domain_provided_dsl_not_needed.yaml
diff --git a/...ovided_but_incorrect_(u3_not_needed).yaml → ...provided_but_incorrect_u3_not_needed.yaml b/...ovided_but_incorrect_(u3_not_needed).yaml → ...provided_but_incorrect_u3_not_needed.yaml
diff --git a/.maestro/app_tp/app_tp_onboarding.yaml b/.maestro/app_tp/app_tp_onboarding.yaml
@@ -36,7 +36,9 @@ tags:
       text: "Good news! App Tracking Protection is now enabled.*"
 - assertVisible: "Got it!"
 - tapOn: "Got it!"
-- assertVisible: "Protection for some apps is automatically disabled. View apps"
+- assertVisible:
+    text: "Protection for some apps is automatically disabled. View apps"
+    optional: true
 - assertVisible: "Blocked tracking attempts will appear here"
 - assertVisible:
     id: "com.duckduckgo.mobile.android:id/activity_apps"

diff --git a/.maestro/autofill/steps/search_logins.yaml b/.maestro/autofill/steps/search_logins.yaml
@@ -3,6 +3,13 @@ name: "Autofill: Search credentials"
 ---
 # Pre-requisite: the user is viewing the password manager screen with some saved passwords added by a previous test step, on an autofill-eligible device
 
+- runFlow:
+    when:
+      visible: "Help us improve!"
+    commands:
+      - tapOn:
+          id: "com.duckduckgo.mobile.android:id/close"
+
 - runFlow:
     when:
       visible: "Sync & Back Up Your Passwords"

diff --git a/.maestro/bookmarks/ensure_bookmarks_can_be_added_and_deleted.yaml b/.maestro/bookmarks/ensure_bookmarks_can_be_added_and_deleted.yaml
@@ -12,8 +12,7 @@ tags:
 - tapOn:
     text: "search or type URL"
 - inputText: "https://privacy-test-pages.site"
-- tapOn:
-    id: "com.google.android.inputmethod.latin:id/key_pos_ime_action"
+- pressKey: Enter
 - assertVisible:
     text: ".*keep browsing.*"
 - tapOn:

diff --git a/.maestro/bookmarks/open_bookmark_and_navigate_back.yaml b/.maestro/bookmarks/open_bookmark_and_navigate_back.yaml
@@ -12,8 +12,7 @@ tags:
 - tapOn:
       text: "search or type URL"
 - inputText: "https://www.search-company.site/"
-- tapOn:
-      id: "com.google.android.inputmethod.latin:id/key_pos_ime_action"
+- pressKey: Enter
 - assertVisible:
       text: ".*keep browsing.*"
 - tapOn:
@@ -22,9 +21,8 @@ tags:
       text: "Search engine"
 - tapOn:
       text: "https://www.search-company.site/"
-- inputText: "https://privacy-test-pages.glitch.me"
-- tapOn:
-      id: "com.google.android.inputmethod.latin:id/key_pos_ime_action"
+- inputText: "https://privacy-test-pages.site"
+- pressKey: Enter
 - assertVisible:
       text: "Privacy Test Pages"
 - tapOn:

diff --git a/.maestro/bookmarks/open_bookmark_in_folder_and_navigate_back.yaml b/.maestro/bookmarks/open_bookmark_in_folder_and_navigate_back.yaml
@@ -11,9 +11,8 @@ tags:
 
 - tapOn:
       text: "search or type URL"
-- inputText: "https://privacy-test-pages.glitch.me/"
-- tapOn:
-      id: "com.google.android.inputmethod.latin:id/key_pos_ime_action"
+- inputText: "https://privacy-test-pages.site/"
+- pressKey: Enter
 - assertVisible:
       text: ".*keep browsing.*"
 - tapOn:
@@ -27,10 +26,9 @@ tags:
 - tapOn:
       text: "add bookmark"
 - tapOn:
-      text: "https://privacy-test-pages.glitch.me/"
+      text: "https://privacy-test-pages.site/"
 - inputText: "https://www.search-company.site/"
-- tapOn:
-    id: "com.google.android.inputmethod.latin:id/key_pos_ime_action"
+- pressKey: Enter
 - assertVisible:
     text: "Search engine"
 - tapOn:

diff --git a/.maestro/browsing/visit_site.yaml b/.maestro/browsing/visit_site.yaml
@@ -12,8 +12,7 @@ tags:
 - tapOn:
     text: "search or type URL"
 - inputText: "https://privacy-test-pages.site"
-- tapOn:
-    id: "com.google.android.inputmethod.latin:id/key_pos_ime_action"
+- pressKey: Enter
 - assertVisible:
     text: ".*keep browsing.*"
 - tapOn:

diff --git a/.maestro/favorites/favorites_bookmarks_add.yaml b/.maestro/favorites/favorites_bookmarks_add.yaml
@@ -12,8 +12,7 @@ tags:
 - tapOn:
     text: "search or type URL"
 - inputText: "https://privacy-test-pages.site"
-- tapOn:
-    id: "com.google.android.inputmethod.latin:id/key_pos_ime_action"
+- pressKey: Enter
 - assertVisible:
     text: ".*keep browsing.*"
 - tapOn:

diff --git a/.maestro/favorites/favorites_bookmarks_delete.yaml b/.maestro/favorites/favorites_bookmarks_delete.yaml
@@ -12,8 +12,7 @@ tags:
 - tapOn:
     text: "search or type URL"
 - inputText: "https://privacy-test-pages.site"
-- tapOn:
-    id: "com.google.android.inputmethod.latin:id/key_pos_ime_action"
+- pressKey: Enter
 - assertVisible:
     text: ".*keep browsing.*"
 - tapOn:

diff --git a/.maestro/fire_button/fire_during_onboarding.yaml b/.maestro/fire_button/fire_during_onboarding.yaml
@@ -12,8 +12,7 @@ tags:
 - tapOn:
     text: "search or type URL"
 - inputText: "https://privacy-test-pages.site"
-- tapOn:
-    id: "com.google.android.inputmethod.latin:id/key_pos_ime_action"
+- pressKey: Enter
 - assertVisible:
     text: ".*keep browsing.*"
 - tapOn:

diff --git a/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml b/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml
@@ -91,11 +91,7 @@ tags:
     text: "convert.ad-company.site"
 - action: back
 - action: back
-- tapOn:
-    id: "com.android.systemui:id/recent_apps"
-- swipe:
-    start: 100,500
-    end: 100,200
+- killApp
 - launchApp:
     clearState: false
 - assertVisible:

diff --git a/.maestro/tabs/open_multiple_tabs.yaml b/.maestro/tabs/open_multiple_tabs.yaml
@@ -12,8 +12,7 @@ tags:
 - tapOn:
     text: "search or type URL"
 - inputText: "https://privacy-test-pages.site"
-- tapOn:
-    id: "com.google.android.inputmethod.latin:id/key_pos_ime_action"
+- pressKey: Enter
 - assertVisible:
     text: ".*keep browsing.*"
 - tapOn:
@@ -26,8 +25,7 @@ tags:
 - assertVisible:
     text: "Search or type URL"
 - inputText: "https://www.search-company.site"
-- tapOn:
-    id: "com.google.android.inputmethod.latin:id/key_pos_ime_action"
+- pressKey: Enter
 - assertVisible:
     text: "Search engine"
 - tapOn:

diff --git a/...ig/app-build-config-api/src/main/java/com/duckduckgo/appbuildconfig/api/AppBuildConfig.kt b/...ig/app-build-config-api/src/main/java/com/duckduckgo/appbuildconfig/api/AppBuildConfig.kt
@@ -38,6 +38,11 @@ interface AppBuildConfig {
      * You should call [variantName] in a background thread
      */
     val variantName: String?
+
+    /**
+     * @return `true` if the user re-installed the app, `false` otherwise
+     */
+    suspend fun isAppReinstall(): Boolean
 }
 
 enum class BuildFlavor {

diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_open_in_24.xml b/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_open_in_24.xml