Skip to content

Fix Download as #3929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marinofaggiana merged 1 commit into from
Dec 15, 2025
+22 −7
Merged

Fix Download as #3929

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 22 additions & 7 deletions iOSClient/Viewer/NCViewerRichdocument/NCViewerRichDocument.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ class NCViewerRichDocument: UIViewController, WKNavigationDelegate, WKScriptMess
guard let type = values["Type"] as? String else { return }
guard let urlString = values["URL"] as? String else { return }
guard let url = URL(string: urlString) else { return }
let fileName = (metadata.fileName as NSString).deletingPathExtension
var fileName = (metadata.fileName as NSString).deletingPathExtension
let fileNameLocalPath = utilityFileSystem.createServerUrl(serverUrl: utilityFileSystem.directoryUserData, fileName: fileName)

if type == "slideshow" {
Expand Down Expand Up @@ -227,12 +227,11 @@ class NCViewerRichDocument: UIViewController, WKNavigationDelegate, WKScriptMess
var item = fileNameLocalPath

if let headers {
if let disposition = headers["Content-Disposition"] as? String {
let components = disposition.components(separatedBy: "filename=")
if components.last?.replacingOccurrences(of: "\"", with: "") != nil {
item = self.utilityFileSystem.createServerUrl(serverUrl: self.utilityFileSystem.directoryUserData, fileName: fileName)
_ = self.utilityFileSystem.moveFile(atPath: fileNameLocalPath, toPath: item)
}
if let disposition = headers["Content-Disposition"] as? String,
let filenameContentDisposition = self.filenameFromContentDisposition(disposition) {
fileName = filenameContentDisposition
item = self.utilityFileSystem.createServerUrl(serverUrl: self.utilityFileSystem.directoryUserData, fileName: fileName)
_ = self.utilityFileSystem.moveFile(atPath: fileNameLocalPath, toPath: item)
}
}

Expand Down Expand Up @@ -361,6 +360,22 @@ class NCViewerRichDocument: UIViewController, WKNavigationDelegate, WKScriptMess
public func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
NCActivityIndicator.shared.stop()
}

// MARK: - Hekper

func filenameFromContentDisposition(_ disposition: String) -> String? {
if let range = disposition.range(of: "filename=") {
var value = String(disposition[range.upperBound...]).trimmingCharacters(in: .whitespaces)
// Cut at next ';' if present
if let semi = value.firstIndex(of: ";") {
value = String(value[..<semi])
}
// Remove optional quotes
value = value.trimmingCharacters(in: CharacterSet(charactersIn: "\""))
return value.isEmpty ? nil : value
}
return nil
}
}

extension NCViewerRichDocument: UINavigationControllerDelegate {
Expand Down
Loading