ReceiveTempSMS
/
Kurdtvs-Live-Kurdish-TV-Kurdmax
forked from zelo72/mastodon-ios
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #190 from tootsuite/fix/open-email 

Fix open email wrong path and redirect missing issue
This commit is contained in:
CMK 2021-07-01 11:50:40 +08:00 committed by GitHub
parent 472466218f 85e39115e7
commit 205cc39af3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
View File

@ -12,7 +12,7 @@
<key>CoreDataStack.xcscheme_^#shared#^_</key> <key>CoreDataStack.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>27</integer> <integer>21</integer>
</dict> </dict>
<key>Mastodon - ASDK.xcscheme_^#shared#^_</key> <key>Mastodon - ASDK.xcscheme_^#shared#^_</key>
<dict> <dict>
@ -37,7 +37,7 @@
<key>NotificationService.xcscheme_^#shared#^_</key> <key>NotificationService.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>26</integer> <integer>20</integer>
</dict> </dict>
</dict> </dict>
<key>SuppressBuildableAutocreation</key> <key>SuppressBuildableAutocreation</key>

11
Mastodon/Info.plist
View File

@ -2,6 +2,17 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleURLSchemes</key>
<array>
<string>mastodon</string>
</array>
<key>CFBundleURLName</key>
<string>org.joinmastodon.app</string>
</dict>
</array>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string> <string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>

6
Mastodon/Scene/Onboarding/ConfirmEmail/MastodonConfirmEmailViewController.swift
View File

@ -171,7 +171,7 @@ extension MastodonConfirmEmailViewController {
func showEmailAppAlert() { func showEmailAppAlert() {
let clients = ThirdPartyMailClient.clients() let clients = ThirdPartyMailClient.clients()
let application = UIApplication.shared let application = UIApplication.shared
let avaliableClients = clients.filter { client -> Bool in let availableClients = clients.filter { client -> Bool in
ThirdPartyMailer.application(application, isMailClientAvailable: client) ThirdPartyMailer.application(application, isMailClientAvailable: client)
} }
let alertController = UIAlertController(title: L10n.Scene.ConfirmEmail.OpenEmailApp.openEmailClient, message: nil, preferredStyle: .alert) let alertController = UIAlertController(title: L10n.Scene.ConfirmEmail.OpenEmailApp.openEmailClient, message: nil, preferredStyle: .alert)
@ -180,9 +180,9 @@ extension MastodonConfirmEmailViewController {
UIApplication.shared.open(URL(string: "message://")!, options: [:], completionHandler: nil) UIApplication.shared.open(URL(string: "message://")!, options: [:], completionHandler: nil)
} }
alertController.addAction(alertAction) alertController.addAction(alertAction)
_ = avaliableClients.compactMap { client -> UIAlertAction in _ = availableClients.compactMap { client -> UIAlertAction in
let alertAction = UIAlertAction(title: client.name, style: .default) { _ in let alertAction = UIAlertAction(title: client.name, style: .default) { _ in
_ = ThirdPartyMailer.application(application, openMailClient: client, recipient: nil, subject: nil, body: nil) _ = ThirdPartyMailer.application(application, openMailClient: client)
} }
alertController.addAction(alertAction) alertController.addAction(alertAction)
return alertAction return alertAction

4
Mastodon/Supporting Files/AppDelegate.swift
View File

@ -56,6 +56,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// Use this method to release any resources that were specific to the discarded scenes, as they will not return. // Use this method to release any resources that were specific to the discarded scenes, as they will not return.
} }
func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
return true
}
} }
extension AppDelegate { extension AppDelegate {