- HelpAndSupportViewController: new view controller providing an overview of help and support options with a brief textual description, adding the forums to the mix

- MoreSettingsSection: for non-branded apps show "Help & Support" instead of "Documentation", "Help" and "Feedback" in the Settings
- VendorServices+App / MoreSettingsSection: refactor to make openSFWebView(on:for:withConfirmation:) part of VendorServices and thereby available to the whole code base
- PDFViewerViewController: make use of VendorServices new openSFWebView(on:for:withConfirmation:) method to ask the user before opening URLs

Author: felix-schwarz

ownCloud.xcodeproj/project.pbxproj

@@ -224,6 +224,7 @@
 		DC16213E2B8FF06800EB17F8 /* OCSidebarItem+Interactions.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC16213D2B8FF06800EB17F8 /* OCSidebarItem+Interactions.swift */; };
 		DC18898E218A773700CFB3F9 /* ownCloudMocking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0196A620F754CA00C41B78 /* ownCloudMocking.framework */; };
 		DC1B270C209CF34B004715E1 /* BookmarkViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC1B270B209CF34B004715E1 /* BookmarkViewController.swift */; };
+		DC1BEEF62C2DFE940016C94F /* HelpAndSupportViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC1BEEF52C2DFE940016C94F /* HelpAndSupportViewController.swift */; };
 		DC20DE6A21C01B210096000B /* ownCloudSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 239369782076110900BCE21A /* ownCloudSDK.framework */; };
 		DC20DE6B21C01B210096000B /* ownCloudUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2393697C2076110900BCE21A /* ownCloudUI.framework */; };
 		DC2218C62822C5B900808BCE /* OCVFSNode+FileProviderItem.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2218C52822C5B900808BCE /* OCVFSNode+FileProviderItem.m */; };
@@ -1290,6 +1291,7 @@
 		DC16213D2B8FF06800EB17F8 /* OCSidebarItem+Interactions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OCSidebarItem+Interactions.swift"; sourceTree = "<group>"; };
 		DC1AC7CF2319ADAE002B7892 /* ScanViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanViewController.swift; sourceTree = "<group>"; };
 		DC1B270B209CF34B004715E1 /* BookmarkViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkViewController.swift; sourceTree = "<group>"; };
+		DC1BEEF52C2DFE940016C94F /* HelpAndSupportViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HelpAndSupportViewController.swift; sourceTree = "<group>"; };
 		DC2218C42822C5B900808BCE /* OCVFSNode+FileProviderItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OCVFSNode+FileProviderItem.h"; sourceTree = "<group>"; };
 		DC2218C52822C5B900808BCE /* OCVFSNode+FileProviderItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "OCVFSNode+FileProviderItem.m"; sourceTree = "<group>"; };
 		DC2218CA2823329100808BCE /* FileProviderContentEnumerator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FileProviderContentEnumerator.h; sourceTree = "<group>"; };
@@ -2626,6 +2628,7 @@
 				4C1561E7222321E0009C4EF3 /* PhotoSelectionViewController.swift */,
 				4C1561EE22232357009C4EF3 /* PhotoSelectionViewCell.swift */,
 				DC6CC3142642C3560040ECAC /* ExternalBrowserBusyHandler.swift */,
+				DC1BEEF52C2DFE940016C94F /* HelpAndSupportViewController.swift */,
 			);
 			path = Client;
 			sourceTree = "<group>";
@@ -4666,6 +4669,7 @@
 				DC63208521FCEBE9007EC0A8 /* ClientActivityCell.swift in Sources */,
 				DC62514A225CEB4300736874 /* UploadMediaAction.swift in Sources */,
 				025FC72924781659009307A7 /* AutoUploadSettingsSection.swift in Sources */,
+				DC1BEEF62C2DFE940016C94F /* HelpAndSupportViewController.swift in Sources */,
 				DC9BFBBD20A1C37B007064B5 /* PasswordManagerAccess.swift in Sources */,
 				23D5241521491C670002C566 /* DisplayViewController.swift in Sources */,
 				DCB7969D2BCE71C300D6D759 /* OpenShortcutFileAction.swift in Sources */,

ownCloud/Client/HelpAndSupportViewController.swift

@@ -0,0 +1,108 @@
+//
+//  HelpAndSupportViewController.swift
+//  ownCloud
+//
+//  Created by Felix Schwarz on 27.06.24.
+//  Copyright © 2024 ownCloud GmbH. All rights reserved.
+//
+
+/*
+ * Copyright (C) 2024, ownCloud GmbH.
+ *
+ * This code is covered by the GNU Public License Version 3.
+ *
+ * For distribution utilizing Apple mechanisms please see https://owncloud.org/contribute/iOS-license-exception/
+ * You should have received a copy of this license along with this program. If not, see <http://www.gnu.org/licenses/gpl-3.0.en.html>.
+ *
+ */
+
+import UIKit
+import ownCloudSDK
+import ownCloudApp
+import ownCloudAppShared
+
+class HelpAndSupportViewController: CollectionViewController {
+	init() {
+		super.init(context: nil, sections: nil, useStackViewRoot: true)
+
+		add(sections: [
+			helpAndSupportSection()
+		])
+	}
+
+	required init?(coder: NSCoder) {
+		fatalError("init(coder:) has not been implemented")
+	}
+
+	override func viewDidLoad() {
+		super.viewDidLoad()
+
+		cssSelectors = [.modal]
+
+		navigationItem.title = "Help & Support".localized
+		navigationItem.largeTitleDisplayMode = .always
+
+		navigationItem.rightBarButtonItem = UIBarButtonItem(systemItem: .close, primaryAction: UIAction(handler: { [weak self] _ in
+			self?.dismiss(animated: true)
+		}))
+	}
+
+	func helpAndSupportSection() -> CollectionViewSection {
+		var elements: [ComposedMessageElement] = []
+
+		if let documentationURL = VendorServices.shared.documentationURL {
+			elements.append(contentsOf: [
+				.title("Documentation".localized),
+				.text("Find information, answers and solutions in the detailed documentation.".localized, style: .informal, cssSelectors: [.message]),
+				.spacing(5),
+
+				.button("View documentation".localized, action: UIAction(handler: { [weak self] _ in
+					if let self {
+						VendorServices.shared.openSFWebView(on: self, for: documentationURL)
+					}
+				}), image: nil, cssSelectors: [ .info ]),
+
+				.spacing(20)
+			])
+		}
+
+		elements.append(contentsOf: [
+			.title("Help".localized),
+			.text("Get in touch with our community in the forums - or file a GitHub issue to report a bug or request a feature.".localized, style: .informal, cssSelectors: [.message]),
+			.spacing(5),
+
+			.button("File an issue".localized, action: UIAction(handler: { [weak self] _ in
+				if let self {
+					VendorServices.shared.openSFWebView(on: self, for: URL(string: "https://github.com/owncloud/ios-app/issues/new/choose")!)
+				}
+			}), image: nil, cssSelectors: [ .info ]),
+
+			.button("Visit the forums".localized, action: UIAction(handler: { [weak self] _ in
+				if let self {
+					VendorServices.shared.openSFWebView(on: self, for: URL(string: "https://central.owncloud.org/c/ios/")!)
+				}
+			}), image: nil, cssSelectors: [ .info ]),
+
+			.spacing(20)
+		])
+
+		if (VendorServices.shared.feedbackMail != nil) || (Branding.shared.feedbackURL != nil) {
+			elements.append(contentsOf: [
+				.title("Send 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]),
+				.spacing(5),
+
+				.button("Send feedback".localized, action: UIAction(handler: { _ in
+					VendorServices.shared.sendFeedback(from: self)
+				}), image: nil, cssSelectors: [ .info ], insets: .zero)
+			])
+		}
+
+		let section = CollectionViewSection(identifier: "helpAndSupport", dataSource: OCDataSourceArray(items: [
+			ComposedMessageView(elements: elements)
+		]))
+
+		return section
+	}
+}

ownCloud/Client/Viewer/PDF/PDFViewerViewController.swift

@@ -20,7 +20,6 @@ import UIKit
 import ownCloudSDK
 import ownCloudAppShared
 import PDFKit
-import SafariServices
 
 class PulsatingButton: UIButton {
 
@@ -510,7 +509,6 @@ class PDFViewerViewController: DisplayViewController, DisplayExtension, UIPopove
 
 extension PDFViewerViewController : PDFViewDelegate {
     func pdfViewWillClick(onLink sender: PDFView, with url: URL) {
-        let vc = SFSafariViewController(url: url)
-        present(vc, animated: true)
+    	VendorServices.shared.openSFWebView(on: self, for: url)
     }
 }

ownCloud/Resources/en.lproj/Localizable.strings

@@ -319,6 +319,17 @@
 "App Version" = "App Version";
 "Version information were copied to the clipboard" = "Version information were copied to the clipboard";
 
+/* Help and support */
+"Help & Support" = "Help & Support";
+
+"Find information, answers and solutions in the detailed documentation." = "Find information, answers and solutions in the detailed documentation.";
+"View documentation" = "View documentation";
+
+"Get in touch with our community in the forums - or file a GitHub issue to report a bug or request a feature." = "Get in touch with our community in the forums - or file a GitHub issue to report a bug or request a feature.";
+"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.";
 
 /* User Interface Settings */
 "Theme" = "Theme";

ownCloud/Settings/MoreSettingsSection.swift

@@ -20,7 +20,6 @@ import CoreFoundation
 import UIKit
 import WebKit
 import MessageUI
-import SafariServices
 import ownCloudSDK
 import ownCloudApp
 import ownCloudAppShared
@@ -31,6 +30,7 @@ class MoreSettingsSection: SettingsSection {
 	private var documentationRow: StaticTableViewRow?
 	private var helpRow: StaticTableViewRow?
 	private var sendFeedbackRow: StaticTableViewRow?
+	private var helpAndSupportRow: StaticTableViewRow?
 	private var recommendRow: StaticTableViewRow?
 	private var privacyPolicyRow: StaticTableViewRow?
 	private var termsOfUseRow: StaticTableViewRow?
@@ -52,14 +52,16 @@ class MoreSettingsSection: SettingsSection {
 	private func createRows() {
 
 		documentationRow = StaticTableViewRow(rowWithAction: { [weak self] (_, _) in
-			if let url = VendorServices.shared.documentationURL {
-				self?.openSFWebViewWithConfirmation(for: url)
+			if let url = VendorServices.shared.documentationURL, let viewController = self?.viewController {
+				VendorServices.shared.openSFWebView(on: viewController, for: url)
 			}
 		}, title: "Documentation".localized, accessoryType: .disclosureIndicator, identifier: "documentation")
 
 		if let helpURL = VendorServices.shared.helpURL {
 			helpRow = StaticTableViewRow(rowWithAction: { [weak self] (_, _) in
-				self?.openSFWebViewWithConfirmation(for: helpURL)
+				if let viewController = self?.viewController {
+					VendorServices.shared.openSFWebView(on: viewController, for: helpURL)
+				}
 			}, title: "Help".localized, accessoryType: .disclosureIndicator, identifier: "help")
 		}
 
@@ -69,6 +71,12 @@ class MoreSettingsSection: SettingsSection {
 			}
 		}, title: "Send feedback".localized, accessoryType: .disclosureIndicator, identifier: "send-feedback")
 
+		helpAndSupportRow = StaticTableViewRow(rowWithAction: { [weak self] (_, _) in
+			if let viewController = self?.viewController {
+				VendorServices.shared.showHelpAndSupportOptions(from: viewController)
+			}
+		}, title: "Help & Support".localized, accessoryType: .disclosureIndicator, identifier: "help-and-support")
+
 		recommendRow = StaticTableViewRow(rowWithAction: { [weak self] (_, _) in
 			if let viewController = self?.viewController {
 				VendorServices.shared.recommendToFriend(from: viewController)
@@ -77,13 +85,17 @@ class MoreSettingsSection: SettingsSection {
 
 		if let privacyURL = VendorServices.shared.privacyURL {
 			privacyPolicyRow = StaticTableViewRow(rowWithAction: { [weak self] (_, _) in
-				self?.openSFWebViewWithConfirmation(for: privacyURL)
+				if let viewController = self?.viewController {
+					VendorServices.shared.openSFWebView(on: viewController, for: privacyURL)
+				}
 			}, title: "Privacy Policy".localized, accessoryType: .disclosureIndicator, identifier: "privacy-policy")
 		}
 
 		if let termsOfUseURL = VendorServices.shared.termsOfUseURL {
 			termsOfUseRow = StaticTableViewRow(rowWithAction: { [weak self] (_, _) in
-				self?.openSFWebViewWithConfirmation(for: termsOfUseURL)
+				if let viewController = self?.viewController {
+					VendorServices.shared.openSFWebView(on: viewController, for: termsOfUseURL)
+				}
 			}, title: "Terms Of Use".localized, accessoryType: .disclosureIndicator, identifier: "terms-of-use")
 		}
 
@@ -115,16 +127,22 @@ class MoreSettingsSection: SettingsSection {
 	func updateUI() {
 		var rows : [StaticTableViewRow] = []
 
-		if VendorServices.shared.documentationURL != nil {
-			rows.append(documentationRow!)
-		}
+		if Branding.shared.isBranded {
+			if VendorServices.shared.documentationURL != nil {
+				rows.append(documentationRow!)
+			}
 
-		if VendorServices.shared.helpURL != nil {
-			rows.append(helpRow!)
-		}
+			if VendorServices.shared.helpURL != nil {
+				rows.append(helpRow!)
+			}
 
-		if VendorServices.shared.feedbackMail != nil || Branding.shared.feedbackURL != nil {
-			rows.append(sendFeedbackRow!)
+			if VendorServices.shared.feedbackMail != nil || Branding.shared.feedbackURL != nil {
+				rows.append(sendFeedbackRow!)
+			}
+		} else {
+			if VendorServices.shared.documentationURL != nil || (VendorServices.shared.feedbackMail != nil || Branding.shared.feedbackURL != nil) {
+				rows.append(helpAndSupportRow!)
+			}
 		}
 
 		if let recommendToFriend = VendorServices.classSetting(forOCClassSettingsKey: .recommendToFriendEnabled) as? Bool, recommendToFriend {
@@ -142,18 +160,4 @@ class MoreSettingsSection: SettingsSection {
 
 		add(rows: rows)
 	}
-
-	private func openSFWebViewWithConfirmation(for url: URL) {
-		let alert = ThemedAlertController(title: "Do you want to open the following URL?".localized,
-					      message: url.absoluteString,
-					      preferredStyle: .alert)
-
-		let okAction = UIAlertAction(title: "OK", style: .default) { (_) in
-			self.viewController?.present(SFSafariViewController(url: url), animated: true)
-		}
-		let cancelAction = UIAlertAction(title: "Cancel".localized, style: .cancel)
-		alert.addAction(okAction)
-		alert.addAction(cancelAction)
-		self.viewController?.present(alert, animated: true)
-	}
 }

ownCloud/Tools/VendorServices+App.swift

@@ -21,12 +21,12 @@ import MessageUI
 import ownCloudApp
 import ownCloudAppShared
 import ownCloudSDK
+import SafariServices
 
 extension VendorServices {
 	public func recommendToFriend(from viewController: UIViewController) {
-
 		guard let appStoreLink = self.classSetting(forOCClassSettingsKey: .appStoreLink) as? String else {
-				return
+			return
 		}
 		let appName = VendorServices.shared.appName
 
@@ -37,6 +37,15 @@ extension VendorServices {
 		self.sendMail(to: nil, subject: "Try \(appName) on your smartphone!", message: message, from: viewController)
 	}
 
+	public func showHelpAndSupportOptions(from viewController: UIViewController) {
+		let feedbackViewController = HelpAndSupportViewController()
+
+		let navigationViewController = ThemeNavigationController(rootViewController: feedbackViewController)
+		navigationViewController.navigationBar.prefersLargeTitles = true
+
+		viewController.present(navigationViewController, animated: true)
+	}
+
 	public func sendFeedback(from viewController: UIViewController) {
 		if let sendFeedbackURL = Branding.shared.feedbackURL {
 			UIApplication.shared.open(sendFeedbackURL, options: [:], completionHandler: nil)
@@ -86,6 +95,24 @@ extension VendorServices {
 			viewController.present(alert, animated: true)
 		}
 	}
+
+	public func openSFWebView(on viewController: UIViewController, for url: URL, withConfirmation: Bool = true) {
+		if withConfirmation {
+			let alert = ThemedAlertController(title: "Do you want to open the following URL?".localized,
+						      message: url.absoluteString,
+						      preferredStyle: .alert)
+
+			let okAction = UIAlertAction(title: "OK", style: .default) { (_) in
+				viewController.present(SFSafariViewController(url: url), animated: true)
+			}
+			let cancelAction = UIAlertAction(title: "Cancel".localized, style: .cancel)
+			alert.addAction(okAction)
+			alert.addAction(cancelAction)
+			viewController.present(alert, animated: true)
+		} else {
+			viewController.present(SFSafariViewController(url: url), animated: true)
+		}
+	}
 }
 
 extension VendorServices: MFMailComposeViewControllerDelegate {