Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion Share/NCShareExtension+Files.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,22 @@ extension NCShareExtension {
func reloadData() async {
let session = NCShareExtensionData.shared.getSession()
let layoutForView = NCManageDatabase.shared.getLayoutForView(account: session.account, key: keyLayout, serverUrl: serverUrl)
let predicate = NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileName != %@ AND directory == true", session.account, serverUrl, NextcloudKit.shared.nkCommonInstance.rootFileName)
let showHiddenFiles = NCPreferences().getShowHiddenFiles(account: session.account)
let predicate = showHiddenFiles
? NSPredicate(
format: "account == %@ AND serverUrl == %@ AND fileName != %@ AND directory == true",
session.account,
serverUrl,
NextcloudKit.shared.nkCommonInstance.rootFileName
)
: NSPredicate(
format: "account == %@ AND serverUrl == %@ AND fileName != %@ AND directory == true AND NOT fileName BEGINSWITH[c] %@",
session.account,
serverUrl,
NextcloudKit.shared.nkCommonInstance.rootFileName,
"."
)

let metadatas = await NCManageDatabase.shared.getMetadatasAsync(predicate: predicate,
withLayout: layoutForView,
withAccount: session.account)
Expand Down
6 changes: 1 addition & 5 deletions iOSClient/Networking/NCNetworking+WebDAV.swift
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ extension NCNetworking {
account: String,
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
completion: @escaping (_ account: String, _ metadata: tableMetadata?, _ file: NKFile?, _ error: NKError) -> Void) {
let showHiddenFiles = NCPreferences().getShowHiddenFiles(account: account)

NextcloudKit.shared.readFileOrFolder(serverUrlFileName: serverUrlFileName, depth: "0", showHiddenFiles: showHiddenFiles, account: account) { task in
NextcloudKit.shared.readFileOrFolder(serverUrlFileName: serverUrlFileName, depth: "0", account: account) { task in
Task {
let identifier = await NCNetworking.shared.networkingTasks.createIdentifier(account: account,
path: serverUrlFileName,
Expand All @@ -69,10 +67,8 @@ extension NCNetworking {
func readFileAsync(serverUrlFileName: String,
account: String,
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in }) async -> (account: String, metadata: tableMetadata?, error: NKError) {
let showHiddenFiles = NCPreferences().getShowHiddenFiles(account: account)
let results = await NextcloudKit.shared.readFileOrFolderAsync(serverUrlFileName: serverUrlFileName,
depth: "0",
showHiddenFiles: showHiddenFiles,
account: account) { task in
Task {
let identifier = await NCNetworking.shared.networkingTasks.createIdentifier(account: account,
Expand Down
Loading