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

Subscription Entitlement Checks #2491

Merged
merged 73 commits into from
Feb 20, 2024
Merged

Subscription Entitlement Checks #2491

merged 73 commits into from
Feb 20, 2024

Conversation

afterxleep
Copy link
Collaborator

@afterxleep afterxleep commented Feb 20, 2024 •
edited
Loading

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

Description:

  • Adopts the final entitlements for subscriptions
  • Updates to latest BSK

Steps to test this PR:

  1. Get a subscription
  2. Confirm all three options are visible in settings

@afterxleep
Barebones integration
653bb53
@afterxleep
Full screen modal for subscription
6c9e0f7
@afterxleep
Close button works as expected
326e494
@afterxleep
Setup Subscription environment after dismissing subscription flow
475ee0f
@afterxleep
Update navigation Management to support iOS 15
434e2b3
@afterxleep
Cleanup
3c1c04f
@afterxleep
Improved memory management and navigation for AsyncVIews
f3ccda3
@afterxleep
Back Button Navigation
4746fff
@afterxleep
Delay publishing scroll updates
9ee45ac
@afterxleep
Reset Subscription Flow after subscription is restored
4d5c00b
@afterxleep
Navigation Updates
939c537
@afterxleep
Added Close button to navbar
fe59f8b
@afterxleep
Share PDF
ba12661
@afterxleep
Support window.open links
5749f5e
@afterxleep
Cleanup
5fe2ff5
@afterxleep
Merge branch 'main' into daniel/subscriptions/8.itp
4ea409c
@afterxleep
PIR View (In progress)
62d664c
@afterxleep
PR Feedback
db47486
@afterxleep
Fix file name
2555d4f
@afterxleep
Merge branch 'daniel/subscriptions/8.itp' into daniel/subscriptions/9…
02c0718 
….pir

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo/Subscription/Views/NavigationBarModifier.swift
@afterxleep
Personal information removal view
5be64e2
@afterxleep
Remove waitlists for browser views
7b25367
@afterxleep
Add new views to browser links
1d4692c
@afterxleep
Merge branch 'main' into daniel/subscriptions/9.pir
1e59341 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo/SettingsSubscriptionView.swift
@afterxleep
Add subscriptionView link
b1c99d0
@afterxleep
Properly center the title
bdaf3b5
@afterxleep
Fix typo
cfc8fc4
@afterxleep
Cleanup
856ece7
@afterxleep
Package.resolved
9c0058b
@afterxleep
Removed more stuff around Windows waitlist
ab994cf
@afterxleep
Disable Javascript and add AllowedDomains array to headlesswebview
37b6ef6
@afterxleep
Privacy protection and domain blocking for web views
347d17d
@afterxleep
Privacy Protections in webviews
4aee751
@afterxleep
Remove unwanted print
71cee56
@afterxleep
Add ITP and DBP links to subscription welcome page
f430fdc
@afterxleep
Merge branch 'main' into daniel/subscriptions/11-itp-fixes
f2f5163 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/Subscription/ViewModel/SubscriptionITPViewModel.swift
#	LocalPackages/DuckUI/Package.swift
#	LocalPackages/SyncUI/Package.swift
#	LocalPackages/Waitlist/Package.swift
@afterxleep
Merged Main
a5b575f
@afterxleep
Link fixes and cleanup
85a439a
@afterxleep
Updated constats
f97625a
@afterxleep
Renamed file
7f2d0d6
@afterxleep
Update header
72fdf7f
@afterxleep
External schemes do not fire a sheet on ITP
4651afe
@afterxleep
Move External website sheet out of the nav stack
65736ac
@afterxleep
Fix warning
7175e01
@afterxleep
Removed print
9e1ab21
@afterxleep
Update entitlements check
f68ce2a
@afterxleep
Updating BSK and setting up entitlements
5bfcf67
@afterxleep
Merge branch 'main' into daniel/subscriptions/12.entitltements
dddafd8 
# Conflicts:
#	DuckDuckGo/SettingsViewModel.swift
#	DuckDuckGo/SubscriptionDebugViewController.swift
@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 Feb 20, 2024
@afterxleep afterxleep requested a review from miasma13 February 20, 2024 14:01
@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 Feb 20, 2024
@afterxleep afterxleep merged commit 889d111 into main Feb 20, 2024
13 checks passed
@afterxleep afterxleep deleted the daniel/subscriptions/12.entitltements branch February 20, 2024 16:40
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