fixed QA finding (8): keyboard commands for search and sort order whe…

…re missing in directory picker
owncloud · Apr 16, 2021 · 002ee67 · 002ee67
1 parent 0ea4bb9
commit 002ee67
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 19 deletions.
diff --git a/ownCloud/Key Commands/KeyCommands.swift b/ownCloud/Key Commands/KeyCommands.swift
@@ -679,7 +679,7 @@ extension ClientQueryViewController {
 			shortcuts.append(nextObjectCommand)
 		}
 
-		if let core = core, let rootItem = query.rootItem {
+		if let core = core, let rootItem = query.rootItem, !isMoreButtonPermanentlyHidden {
 			var item = rootItem
 			if let indexPath = self.tableView?.indexPathForSelectedRow, let selectedItem = itemAt(indexPath: indexPath) {
 				item = selectedItem
@@ -789,7 +789,7 @@ extension QueryFileListTableViewController {
 			}
 		}
 
-		if let core = core, let rootItem = query.rootItem {
+		if let core = core, let rootItem = query.rootItem, !isMoreButtonPermanentlyHidden {
 			var item = rootItem
 			if let indexPath = self.tableView?.indexPathForSelectedRow, let selectedItem = itemAt(indexPath: indexPath) {
 				item = selectedItem
@@ -914,22 +914,8 @@ extension ClientDirectoryPickerViewController {
 	open override var keyCommands: [UIKeyCommand]? {
 		var shortcuts = [UIKeyCommand]()
 
-		let nextObjectCommand = UIKeyCommand(input: UIKeyCommand.inputDownArrow, modifierFlags: [], action: #selector(selectNext), discoverabilityTitle: "Select Next".localized)
-		let previousObjectCommand = UIKeyCommand(input: UIKeyCommand.inputUpArrow, modifierFlags: [], action: #selector(selectPrevious), discoverabilityTitle: "Select Previous".localized)
-		let selectObjectCommand = UIKeyCommand(input: UIKeyCommand.inputRightArrow, modifierFlags: [], action: #selector(selectCurrent), discoverabilityTitle: "Open Selected".localized)
-
-		if let selectedIndexPath = self.tableView?.indexPathForSelectedRow {
-			if selectedIndexPath.row < self.items.count - 1 {
-				shortcuts.append(nextObjectCommand)
-			}
-			if selectedIndexPath.row > 0 || selectedIndexPath.section > 0 {
-				shortcuts.append(previousObjectCommand)
-			}
-			if let item : OCItem = self.itemAt(indexPath: selectedIndexPath), item.type == OCItemType.collection {
-				shortcuts.append(selectObjectCommand)
-			}
-		} else {
-			shortcuts.append(nextObjectCommand)
+		if let superKeyCommands = super.keyCommands {
+			shortcuts.append(contentsOf: superKeyCommands)
 		}
 
 		if let selectButtonTitle = selectButton?.title, let selector = selectButton?.action {

diff --git a/ownCloudAppShared/Client/File Lists/ClientDirectoryPickerViewController.swift b/ownCloudAppShared/Client/File Lists/ClientDirectoryPickerViewController.swift
@@ -36,7 +36,6 @@ open class ClientDirectoryPickerViewController: ClientQueryViewController {
 	open var selectButton: UIBarButtonItem?
 	private var selectButtonTitle: String?
 	private var cancelBarButton: UIBarButtonItem?
-
 	open var directoryPath : String?
 
 	open var choiceHandler: ClientDirectoryPickerChoiceHandler?
@@ -115,6 +114,8 @@ open class ClientDirectoryPickerViewController: ClientQueryViewController {
 
 		// Disable pull to refresh
 		allowPullToRefresh = false
+
+		isMoreButtonPermanentlyHidden = true
 	}
 
 	required public init?(coder aDecoder: NSCoder) {