Skip to content

[Privacy Choices] Prevent banner from being dismissed #9815

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

Merged
merged 2 commits into from
May 25, 2023
Merged

[Privacy Choices] Prevent banner from being dismissed #9815

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e86c53
Use a hack to prevent privacy banner to be dismissed
Ecarrion May 24, 2023
1b5ea3d
Prevent dismiss on ipad
Ecarrion May 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions WooCommerce/Classes/ViewRelated/Dashboard/Settings/Privacy/PrivacyBannerPresenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ final class PrivacyBannerPresenter {
})

let bottomSheetViewController = BottomSheetViewController(childViewController: privacyBanner)
bottomSheetViewController.isModalInPresentation = true
bottomSheetViewController.show(from: viewController)
}

Expand Down Expand Up @@ -92,3 +93,15 @@ extension PrivacyBannerPresenter {
static let retry = NSLocalizedString("Retry", comment: "Retry title on the notice action button")
}
}

extension BottomSheetViewController {
/// Temporary hack to prevent the `PrivacyBannerViewController` to be dismissed.
/// This should be changed once https://github.com/wordpress-mobile/WordPressUI-iOS/pull/126 is merged.
///
public override func dismiss(animated flag: Bool, completion: (() -> Void)? = nil) {
if children.first is PrivacyBannerViewController {
return
}
super.dismiss(animated: flag, completion: completion)
}
}