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

[iOS] - Add alert for mobile config download #27115

Merged
merged 4 commits into from
Jan 6, 2025
Merged

[iOS] - Add alert for mobile config download #27115

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
09591e4
Add alert for mobile config download
Brandon-T Jan 3, 2025
4b3d4ca
Fix key dup
Brandon-T Jan 3, 2025
257703d
Add support for calendar mime type
Brandon-T Jan 3, 2025
c155b17
Change title and description of alert to say calendar event instead
Brandon-T Jan 3, 2025
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
32 changes: 30 additions & 2 deletions ...e-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+WKNavigationDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,14 +737,42 @@ extension BrowserViewController: WKNavigationDelegate {
.mobileConfiguration,
]

let mimeTypesThatRequireSFSafariViewControllerHandlingTexts: [UTType: (String, String)] = [
.textCalendar: (Strings.openTextCalendarAlertTitle, Strings.openTextCalendarAlertDescription),
.mobileConfiguration: (
Strings.openMobileConfigurationAlertTitle, Strings.openMobileConfigurationAlertDescription
),
]

// SFSafariViewController only supports http/https links
if navigationResponse.isForMainFrame, let url = responseURL,
url.isWebPage(includeDataURIs: false),
let tab, tab === tabManager.selectedTab,
let mimeType = response.mimeType.flatMap({ UTType(mimeType: $0) }),
mimeTypesThatRequireSFSafariViewControllerHandling.contains(mimeType)
mimeTypesThatRequireSFSafariViewControllerHandling.contains(mimeType),
let (alertTitle, alertMessage) = mimeTypesThatRequireSFSafariViewControllerHandlingTexts[
mimeType
]
{
handleLinkWithSafariViewController(url, tab: tab)
Copy link
Collaborator

Choose a reason for hiding this comment

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

This handles other mime types as well not just mobile configurations

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hmm I think it should do it also for the calendar type.
So both the calendar and the mobile config since you can do the same issue on both.

I'll have to change the text I guess, to handle both.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed. Added calendar support.

// Do what Chromium does: https://source.chromium.org/chromium/chromium/src/+/main:ios/chrome/browser/download/ui_bundled/safari_download_coordinator.mm;l=100;bpv=1;bpt=1?q=presentMobileConfigAlertFromURL&ss=chromium%2Fchromium%2Fsrc
// and present an alert before showing the Safari View Controller
let alert = UIAlertController(
title: alertTitle,
message: String.init(
format: alertMessage,
url.absoluteString
),
preferredStyle: .alert
)
alert.addAction(
UIAlertAction(title: Strings.OBContinueButton, style: .default) { [weak self] _ in
self?.handleLinkWithSafariViewController(url, tab: tab)
}
)

alert.addAction(UIAlertAction(title: Strings.cancelButtonTitle, style: .cancel))
present(alert, animated: true)

return .cancel
}

Expand Down
28 changes: 28 additions & 0 deletions ios/brave-ios/Sources/BraveStrings/BraveStrings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3619,6 +3619,34 @@ extension Strings {
value: "Don't Allow",
comment: "Don't allow Brave to open the external app URL"
)
public static let openMobileConfigurationAlertTitle = NSLocalizedString(
"OpenMobileConfigurationAlertTitle",
tableName: "BraveShared",
bundle: .module,
value: "Configuration profile available",
comment: "Title of the alert when a mobile configuration profile is available for download"
)
public static let openMobileConfigurationAlertDescription = NSLocalizedString(
"OpenMobileConfigurationAlertDescription",
tableName: "BraveShared",
bundle: .module,
value: "Continue download a configuration profile from %@",
comment: "Title of the alert when a mobile configuration profile is available for download. %@ is the URL placeholder of the website where the profile will be downloaded from"
)
public static let openTextCalendarAlertTitle = NSLocalizedString(
"OpenTextCalendarAlertTitle",
tableName: "BraveShared",
bundle: .module,
value: "Calendar available",
Copy link
Collaborator

Choose a reason for hiding this comment

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

May want to say "calendar event" or something along those lines instead

comment: "Title of the alert when a calendar is available for download"
)
public static let openTextCalendarAlertDescription = NSLocalizedString(
"OpenTextCalendarAlertDescription",
tableName: "BraveShared",
bundle: .module,
value: "Continue download a calendar from %@",
comment: "Title of the alert when a calendar is available for download. %@ is the URL placeholder of the website where the calendar will be downloaded from"
)
public static let requestCameraPermissionPrompt = NSLocalizedString(
"requestCameraPermissionPrompt",
tableName: "BraveShared",
Expand Down
Loading