Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

18. Subscription Entitlements caching #2556

Merged
merged 6 commits into from
Mar 8, 2024
Merged

18. Subscription Entitlements caching #2556

merged 6 commits into from
Mar 8, 2024

Conversation

afterxleep
Copy link
Collaborator

@afterxleep afterxleep commented Mar 7, 2024 •
edited
Loading

Task/Issue URL: https://app.asana.com/0/1204099484721401/1206574474409573/f

Description:

  • This PR just bumps BSK (No changes required on iOS)
  • MainActor change has no relation to subscriptions - iOS app was broken in main because of a change in BSK, this fixes that

Steps to test this PR:

    1. Check instructions in BSK PR

@afterxleep afterxleep requested a review from miasma13 March 7, 2024 17:02
@github-actions github-actions bot added the bot: not in app board Added by automation for pull requests with tasks not added to iOS App Board Asana project label Mar 7, 2024
@afterxleep afterxleep mentioned this pull request Mar 7, 2024
Merged
@afterxleep afterxleep removed the bot: not in app board Added by automation for pull requests with tasks not added to iOS App Board Asana project label Mar 7, 2024
miasma13
miasma13 approved these changes Mar 8, 2024
View reviewed changes
Copy link
Contributor

@miasma13 miasma13 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but please double check that no unnecessary changes are committed in DuckDuckGo.xcodeproj/project.pbxproj

@afterxleep
Remove local BSK
244d1c5
@afterxleep
Bump BSP
c19a53c
@afterxleep
Revert alpha cert
c7033a4
@afterxleep
Merge branch 'main' into daniel/subscriptions/18.entitlements-cache
e89f512 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@afterxleep afterxleep merged commit 9beb215 into main Mar 8, 2024
13 checks passed
@afterxleep afterxleep deleted the daniel/subscriptions/18.entitlements-cache branch March 8, 2024 17:26
samsymons added a commit that referenced this pull request Mar 11, 2024
@samsymons
Merge branch 'main' into sam/improve-vpn-metadata
b11d103 
* main: (28 commits)
  Fix VPN view model memory leak (#2570)
  Bump submodules/privacy-reference-tests from `40ce868` to `a603ff9` (#2500)
  18. Subscription Entitlements caching (#2556)
  Release 7.111.0-2 (#2563)
  Revert "Report Apple Ad attribution using pixel (#2510)" (#2562)
  Vanilla browser integration (#2550)
  Fix blank space after URL bar hides (#2549)
  Release 7.111.0-1 (#2561)
  Point to BSK hotfix (#2558)
  Prevent redeeming invite codes after the VPN test ends (#2559)
  Updates Kingfisher to 7.11.0 (#2545)
  Makes network path metadata description anonymous (#2544)
  Adds pixels to track main VPN funnels (#2543)
  Cleanup after rolling out autoconsent enabled by default (#2537)
  Add #URL macro (#2540)
  Handle expired entitlement in NetP (#2525)
  Remove isSubscriptionEnabled check when attempting to delete NetP token (#2548)
  Validate correct environment (#2546)
  Remove CGNAT range (#2524)
  Add preliminary support for subscription keychain sharing (#2538)
  ...
samsymons added a commit that referenced this pull request Mar 13, 2024
@samsymons
Merge branch 'main' into sam/vpn-ui-improvements
9f5800b 
* main:
  Subscriptions: 20 - Subscription Caching (#2569)
  Subscriptions: 19. Error handling and minor updates (#2567)
  Use History on iOS (#2539)
  Release 7.112.0-1 (#2573)
  Report on toggle protections off (#2536)
  Release 7.112.0-0 (#2572)
  Update autoconsent to v10.2.0 (#2554)
  update metadata (#2571)
  Subscription pro pixels (#2531)
  Update SwiftSoup and Kingfisher versions (#2566)
  Move vpnFirstEnabled and networkPathChange out of VPNSettings (#2560)
  Fix VPN view model memory leak (#2570)
  Bump submodules/privacy-reference-tests from `40ce868` to `a603ff9` (#2500)
  18. Subscription Entitlements caching (#2556)
  Release 7.111.0-2 (#2563)
  Revert "Report Apple Ad attribution using pixel (#2510)" (#2562)
  Vanilla browser integration (#2550)
  Fix blank space after URL bar hides (#2549)
  Release 7.111.0-1 (#2561)
samsymons added a commit that referenced this pull request Mar 13, 2024
@samsymons
Merge branch 'sam/vpn-ui-improvements' into sam/vpn-ui-improvements-2…
b73a8c9 
…-lottie-animation

* sam/vpn-ui-improvements:
  Subscriptions: 20 - Subscription Caching (#2569)
  Subscriptions: 19. Error handling and minor updates (#2567)
  Use History on iOS (#2539)
  Release 7.112.0-1 (#2573)
  Report on toggle protections off (#2536)
  Release 7.112.0-0 (#2572)
  Update autoconsent to v10.2.0 (#2554)
  update metadata (#2571)
  Subscription pro pixels (#2531)
  Update SwiftSoup and Kingfisher versions (#2566)
  Move vpnFirstEnabled and networkPathChange out of VPNSettings (#2560)
  Fix VPN view model memory leak (#2570)
  Bump submodules/privacy-reference-tests from `40ce868` to `a603ff9` (#2500)
  18. Subscription Entitlements caching (#2556)
  Release 7.111.0-2 (#2563)
  Revert "Report Apple Ad attribution using pixel (#2510)" (#2562)
  Vanilla browser integration (#2550)
  Fix blank space after URL bar hides (#2549)
  Release 7.111.0-1 (#2561)
samsymons added a commit that referenced this pull request Mar 13, 2024
@samsymons
Merge branch 'sam/vpn-ui-improvements-2-lottie-animation' into sam/vp…
dce136f 
…n-ui-improvements-3-combine-notification-settings

* sam/vpn-ui-improvements-2-lottie-animation:
  Subscriptions: 20 - Subscription Caching (#2569)
  Subscriptions: 19. Error handling and minor updates (#2567)
  Use History on iOS (#2539)
  Release 7.112.0-1 (#2573)
  Report on toggle protections off (#2536)
  Release 7.112.0-0 (#2572)
  Update autoconsent to v10.2.0 (#2554)
  update metadata (#2571)
  Subscription pro pixels (#2531)
  Update SwiftSoup and Kingfisher versions (#2566)
  Move vpnFirstEnabled and networkPathChange out of VPNSettings (#2560)
  Fix VPN view model memory leak (#2570)
  Bump submodules/privacy-reference-tests from `40ce868` to `a603ff9` (#2500)
  18. Subscription Entitlements caching (#2556)
  Release 7.111.0-2 (#2563)
  Revert "Report Apple Ad attribution using pixel (#2510)" (#2562)
  Vanilla browser integration (#2550)
  Fix blank space after URL bar hides (#2549)
  Release 7.111.0-1 (#2561)
samsymons added a commit that referenced this pull request Mar 13, 2024
@samsymons
Merge branch 'sam/vpn-ui-improvements-3-combine-notification-settings…
934502c 
…' into sam/vpn-ui-improvements-4-location-setting-change

# By Mariusz Śpiewak (3) and others
# Via Sam Symons (4) and others
* sam/vpn-ui-improvements-3-combine-notification-settings:
  Subscriptions: 20 - Subscription Caching (#2569)
  Subscriptions: 19. Error handling and minor updates (#2567)
  Use History on iOS (#2539)
  Release 7.112.0-1 (#2573)
  Report on toggle protections off (#2536)
  Release 7.112.0-0 (#2572)
  Update autoconsent to v10.2.0 (#2554)
  update metadata (#2571)
  Subscription pro pixels (#2531)
  Update SwiftSoup and Kingfisher versions (#2566)
  Move vpnFirstEnabled and networkPathChange out of VPNSettings (#2560)
  Fix VPN view model memory leak (#2570)
  Bump submodules/privacy-reference-tests from `40ce868` to `a603ff9` (#2500)
  18. Subscription Entitlements caching (#2556)
  Release 7.111.0-2 (#2563)
  Revert "Report Apple Ad attribution using pixel (#2510)" (#2562)
  Vanilla browser integration (#2550)
  Fix blank space after URL bar hides (#2549)
  Release 7.111.0-1 (#2561)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@miasma13 miasma13 miasma13 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@afterxleep @miasma13