Skip to content

Commit

Permalink
Merge branch 'main' into sam/remove-atb-from-default-pixel-parameters
Browse files Browse the repository at this point in the history
* main: (38 commits)
  Disable the feedback send button when there’s no text (#2800)
  Release 7.118.0-0 (#2802)
  Autofill Settings - Import passwords via sync (#2756)
  Fix selected VPN location consistency (#2797)
  Reapply "Report Apple Ad attribution using pixel" (#2702)
  reapply auto clear fix, clear cookies, load page on link click (#2798)
  Toggle Connect on Demand when receiving user initiated VPN lifecycle events (#2771)
  Update BSK to 141.1.1 (#2796)
  iOS: VPN Metadata Improvements (#2791)
  Add Internal Page suggestions support (#2784)
  iOS: Add pixels to track VPN wake and stop attempts (#2785)
  Fix bug that shows selected tab in strange position in the switcher (#2789)
  Remove AppTP (#2682)
  Release 7.117.0-1 (#2794)
  cherry pick progress bar fix (#2793)
  fix progress bar missing after cold launch (#2792)
  Check entitlements before showing VPN screen from notification (#2748)
  Add parameter allowed encoding to error descriptions (#2781)
  Update Lottie to 4.4.3 (#2765)
  Update to fastlane 2.220.0 to fix ad-hoc lane (#2782)
  ...
  • Loading branch information
samsymons committed Apr 30, 2024
2 parents be9eb8f + f2fa437 commit 810603b
Show file tree
Hide file tree
Showing 437 changed files with 6,380 additions and 22,877 deletions.
12 changes: 12 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,18 @@ jobs:
--form "file=@${asana_dsyms_path};type=application/zip"
fi
- name: Upload debug symbols to S3
if: always()
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
DSYM_S3_PATH: s3://${{ vars.DSYM_BUCKET_NAME }}/${{ vars.DSYM_BUCKET_PREFIX }}/
run: |
if [[ -f ${{ env.dsyms_path }} ]]; then
aws s3 cp "${{ env.dsyms_path }}" ${{ env.DSYM_S3_PATH }}
fi
- name: Send Mattermost message
if: ${{ success() || failure() }} # Don't execute when cancelled
env:
Expand Down
56 changes: 56 additions & 0 deletions .maestro/browser_features/search_bar.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# search_bar.yaml
appId: com.duckduckgo.mobile.ios
tags:
- release

---

# Set up
- clearState
- launchApp
- runFlow:
when:
visible:
text: "Let’s Do It!"
index: 0
file: ../shared/onboarding.yaml

# Load Site
- assertVisible:
id: "searchEntry"
- tapOn:
id: "searchEntry"
- inputText: "https://privacy-test-pages.site/features/auto-refresh.html"
- pressKey: Enter

# Manage onboarding
- runFlow:
when:
visible:
text: "Got It"
index: 0
file: ../shared/onboarding_browsing.yaml

- assertVisible: "Website that refreshes every 3 seconds."

# Start typing
- tapOn:
id: "searchEntry"
- inputText: "abcd"
- assertVisible: "abcd"

# Delay execution and let page refresh
- runFlow:
file: ../shared/delay.yaml

# More text to append
- inputText: "efgh"
- assertVisible: "abcdefgh"

# Delay execution and let page refresh
- runFlow:
file: ../shared/delay.yaml

- inputText: "ijkl"
- assertVisible: "abcdefghijkl"

13 changes: 13 additions & 0 deletions .maestro/shared/delay.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# delay.yaml

appId: com.duckduckgo.mobile.ios
---

- runFlow:
when:
visible:
text: "This is just a text that will be never matched so this invocation will cause 5s delay"
index: 0
commands:
- stopApp

2 changes: 1 addition & 1 deletion Configuration/Version.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1 @@
MARKETING_VERSION = 7.116.0
MARKETING_VERSION = 7.118.0
4 changes: 2 additions & 2 deletions Core/AppPrivacyConfigurationDataProvider.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import BrowserServicesKit
final public class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {

public struct Constants {
public static let embeddedDataETag = "\"04caca2ca6549201eea931ca869c5e39\""
public static let embeddedDataSHA = "ddb923e2de2a0a27bc1050e32c89276834a3f3dd61b7c8672dac6f2d93047333"
public static let embeddedDataETag = "\"3985f110d16d3b71dce40191816ad03b\""
public static let embeddedDataSHA = "c3b1efbc76d21e6ecd30f33e26990b149ca8d22fbebecf48add9ffd7d8011450"
}

public var embeddedDataEtag: String {
Expand Down
90 changes: 0 additions & 90 deletions Core/AppTrackerEntity.swift

This file was deleted.

108 changes: 0 additions & 108 deletions Core/AppTrackingProtectionAllowlistModel.swift

This file was deleted.

64 changes: 0 additions & 64 deletions Core/AppTrackingProtectionDatabase.swift

This file was deleted.

Loading

0 comments on commit 810603b

Please sign in to comment.