diff --git a/iphone/Maps/OMaps.plist b/iphone/Maps/OMaps.plist index ff87d6a101..7c03d23ccf 100644 --- a/iphone/Maps/OMaps.plist +++ b/iphone/Maps/OMaps.plist @@ -79,8 +79,7 @@ LSApplicationQueriesSchemes - ms-outlook - googlegmail + mailto LSRequiresIPhoneOS diff --git a/iphone/Maps/UI/Help/AboutController.swift b/iphone/Maps/UI/Help/AboutController.swift index 504c57df9d..70e50d1531 100644 --- a/iphone/Maps/UI/Help/AboutController.swift +++ b/iphone/Maps/UI/Help/AboutController.swift @@ -256,12 +256,13 @@ final class AboutController: MWMViewController, UITableViewDataSource, UITableVi let subject = emailSubject(subject: header) let body = emailBody() - // Try Gmail and Outlook first. - if openGmail(subject: subject, body: body, recipients: toRecipients) - || openOutlook(subject: subject, body: body, recipients: toRecipients) { + // Before iOS 14, try to open alternate email apps first, assuming that if users installed them, they're using them. + let os = ProcessInfo().operatingSystemVersion + if (os.majorVersion < 14 && (openGmail(subject: subject, body: body, recipients: toRecipients) || + openOutlook(subject: subject, body: body, recipients: toRecipients))) { return } - + // From iOS 14, it is possible to change the default mail app, and mailto should open a default mail app. if MWMMailViewController.canSendMail() { let vc = MWMMailViewController() vc.mailComposeDelegate = self