From 2e95ed334ece24768e42c90c2ab904eb32bdece5 Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Thu, 18 Jul 2024 17:25:25 +0200 Subject: [PATCH] - HelpAndSupportViewController: change wording and no longer support sending emails, just a feedback URL (for a survey) - MoreSettingsSection: change wording - VendorServices+App: cleanup code - Branding+App: remove feedback email address and add the iOS app survey's URL as a default in exchange --- ownCloud/Client/HelpAndSupportViewController.swift | 10 +++++----- ownCloud/Resources/en.lproj/Localizable.strings | 5 +++-- ownCloud/Settings/MoreSettingsSection.swift | 2 +- ownCloud/Tools/VendorServices+App.swift | 7 ++----- ownCloudAppShared/Branding/Branding+App.swift | 2 +- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/ownCloud/Client/HelpAndSupportViewController.swift b/ownCloud/Client/HelpAndSupportViewController.swift index 568f4cecd..252961ed4 100644 --- a/ownCloud/Client/HelpAndSupportViewController.swift +++ b/ownCloud/Client/HelpAndSupportViewController.swift @@ -39,7 +39,7 @@ class HelpAndSupportViewController: CollectionViewController { cssSelectors = [.modal] - navigationItem.title = "Help & Support".localized + navigationItem.title = "Help & Contact".localized navigationItem.largeTitleDisplayMode = .always navigationItem.rightBarButtonItem = UIBarButtonItem(systemItem: .close, primaryAction: UIAction(handler: { [weak self] _ in @@ -86,14 +86,14 @@ class HelpAndSupportViewController: CollectionViewController { .spacing(20) ]) - if (VendorServices.shared.feedbackMail != nil) || (Branding.shared.feedbackURL != nil) { + if Branding.shared.feedbackURL != nil { elements.append(contentsOf: [ - .title("Send feedback".localized), + .title("Feedback".localized), - .text("If you don't need a response and just want to send us feedback, you can also send us a mail.".localized, style: .informal, cssSelectors: [.message]), + .text("If you have a moment to give us your feedback, please take our survey.".localized, style: .informal, cssSelectors: [.message]), .spacing(5), - .button("Send feedback".localized, action: UIAction(handler: { [weak self] _ in + .button("Take survey".localized, action: UIAction(handler: { [weak self] _ in if let self { VendorServices.shared.sendFeedback(from: self) } diff --git a/ownCloud/Resources/en.lproj/Localizable.strings b/ownCloud/Resources/en.lproj/Localizable.strings index 5f06cb7c8..53774f859 100644 --- a/ownCloud/Resources/en.lproj/Localizable.strings +++ b/ownCloud/Resources/en.lproj/Localizable.strings @@ -289,6 +289,7 @@ "More for {{title}}" = "More for {{title}}"; "Documentation" = "Documentation"; "Send feedback" = "Send feedback"; +"Take survey" = "Take survey"; "Recommend to a friend" = "Recommend to a friend"; "Privacy Policy" = "Privacy Policy"; "Terms Of Use" = "Terms Of Use"; @@ -320,7 +321,7 @@ "Version information were copied to the clipboard" = "Version information were copied to the clipboard"; /* Help and support */ -"Help & Support" = "Help & Support"; +"Help & Contact" = "Help & Contact"; "Find information, answers and solutions in the detailed documentation." = "Find information, answers and solutions in the detailed documentation."; "View documentation" = "View documentation"; @@ -329,7 +330,7 @@ "File an issue" = "File an issue"; "Visit the forums" = "Visit the forums"; -"If you don't need a response and just want to send us feedback, you can also send us a mail." = "If you don't need a response and just want to send us feedback, you can also send us a mail."; +"If you have a moment to give us your feedback, please take our survey." = "If you have a moment to give us your feedback, please take our survey."; /* User Interface Settings */ "Theme" = "Theme"; diff --git a/ownCloud/Settings/MoreSettingsSection.swift b/ownCloud/Settings/MoreSettingsSection.swift index b800182e1..b7ac5120c 100644 --- a/ownCloud/Settings/MoreSettingsSection.swift +++ b/ownCloud/Settings/MoreSettingsSection.swift @@ -75,7 +75,7 @@ class MoreSettingsSection: SettingsSection { if let viewController = self?.viewController { VendorServices.shared.showHelpAndSupportOptions(from: viewController) } - }, title: "Help & Support".localized, accessoryType: .disclosureIndicator, identifier: "help-and-support") + }, title: "Help & Contact".localized, accessoryType: .disclosureIndicator, identifier: "help-and-contact") recommendRow = StaticTableViewRow(rowWithAction: { [weak self] (_, _) in if let viewController = self?.viewController { diff --git a/ownCloud/Tools/VendorServices+App.swift b/ownCloud/Tools/VendorServices+App.swift index d363da5c0..19f40e4ca 100644 --- a/ownCloud/Tools/VendorServices+App.swift +++ b/ownCloud/Tools/VendorServices+App.swift @@ -49,7 +49,7 @@ extension VendorServices { public func sendFeedback(from viewController: UIViewController) { if let sendFeedbackURL = Branding.shared.feedbackURL { UIApplication.shared.open(sendFeedbackURL, options: [:], completionHandler: nil) - } else { + } else if let feedbackMail { var buildType = "release".localized if self.isBetaBuild { @@ -61,10 +61,7 @@ extension VendorServices { appSuffix = "-EMM" } - guard let feedbackEmail = self.feedbackMail else { - return - } - self.sendMail(to: feedbackEmail, subject: "\(self.appVersion) (\(self.appBuildNumber)) \(buildType) \(self.appName)\(appSuffix)", message: nil, from: viewController) + self.sendMail(to: feedbackMail, subject: "\(self.appVersion) (\(self.appBuildNumber)) \(buildType) \(self.appName)\(appSuffix)", message: nil, from: viewController) } } diff --git a/ownCloudAppShared/Branding/Branding+App.swift b/ownCloudAppShared/Branding/Branding+App.swift index ebf46832b..f3753479a 100644 --- a/ownCloudAppShared/Branding/Branding+App.swift +++ b/ownCloudAppShared/Branding/Branding+App.swift @@ -72,7 +72,7 @@ extension Branding : BrandingInitialization { .helpURL : "https://owncloud.com/docs-guides/", .privacyURL : "https://owncloud.org/privacy-policy/", .termsOfUseURL : "https://raw.githubusercontent.com/owncloud/ios-app/master/LICENSE", - .sendFeedbackAddress : "ios-app@owncloud.com", + .sendFeedbackURL : "https://owncloud.com/ios-app-feedback", .canAddAccount : true, .canEditAccount : true, .enableReviewPrompt : false,