From ff5e805b81d79aa1731770ca51e20fcd5cebf0c1 Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Thu, 12 Sep 2019 13:23:21 -0700 Subject: [PATCH] =?UTF-8?q?Adds=20=E2=80=9CSend=20Feedback=E2=80=9D=20opti?= =?UTF-8?q?on=20in=20settings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AltStore/Settings/Settings.storyboard | 41 +++++++++++++-- .../Settings/SettingsViewController.swift | 52 +++++++++++++++++++ 2 files changed, 89 insertions(+), 4 deletions(-) diff --git a/AltStore/Settings/Settings.storyboard b/AltStore/Settings/Settings.storyboard index 90304225..6aee81ed 100644 --- a/AltStore/Settings/Settings.storyboard +++ b/AltStore/Settings/Settings.storyboard @@ -402,9 +402,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -430,7 +463,7 @@ - + @@ -569,7 +602,7 @@ - Jay Freeman (ldid) + Jay Freeman (ldid) Copyright (C) 2007-2012 Jay Freeman (saurik) libimobiledevice @@ -636,7 +669,7 @@ Kutuzov Viktor (mman-win32) Copyright (c) Kutuzov Viktor Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/AltStore/Settings/SettingsViewController.swift b/AltStore/Settings/SettingsViewController.swift index 93b42b75..505595cf 100644 --- a/AltStore/Settings/SettingsViewController.swift +++ b/AltStore/Settings/SettingsViewController.swift @@ -8,6 +8,7 @@ import UIKit import SafariServices +import MessageUI extension SettingsViewController { @@ -28,6 +29,12 @@ extension SettingsViewController case designer case softwareLicenses } + + fileprivate enum DebugRow: Int, CaseIterable + { + case sendFeedback + case refreshAttempts + } } class SettingsViewController: UITableViewController @@ -290,7 +297,52 @@ extension SettingsViewController break } + case .debug: + let row = DebugRow.allCases[indexPath.row] + switch row + { + case .sendFeedback: + if MFMailComposeViewController.canSendMail() + { + let mailViewController = MFMailComposeViewController() + mailViewController.mailComposeDelegate = self + mailViewController.setToRecipients(["riley@rileytestut.com"]) + + if let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String + { + mailViewController.setSubject("AltStore Beta \(version) Feedback") + } + else + { + mailViewController.setSubject("AltStore Beta Feedback") + } + + self.present(mailViewController, animated: true, completion: nil) + } + else + { + let toastView = ToastView(text: NSLocalizedString("Cannot Send Mail", comment: ""), detailText: nil) + toastView.show(in: self.navigationController?.view ?? self.view, duration: 2.0) + } + + case .refreshAttempts: break + } + default: break } } } + +extension SettingsViewController: MFMailComposeViewControllerDelegate +{ + func mailComposeController(_ controller: MFMailComposeViewController, didFinishWith result: MFMailComposeResult, error: Error?) + { + if let error = error + { + let toastView = ToastView(text: error.localizedDescription, detailText: "") + toastView.show(in: self.navigationController?.view ?? self.view, duration: 2.0) + } + + controller.dismiss(animated: true, completion: nil) + } +}