Skip to content

fix(re-download): office file #17235

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

Open
alperozturk96 wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −2
Open

fix(re-download): office file #17235

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
9 changes: 7 additions & 2 deletions app/src/main/java/com/owncloud/android/utils/RichDocumentDownloadAsParser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,18 @@ object RichDocumentDownloadAsParser {
val format = obj[FORMAT]?.jsonPrimitive?.contentOrNull
val name = obj[NAME]?.jsonPrimitive?.contentOrNull
if (format == null || url == null) return null
return DownloadAs(format = format, filename = name ?: "", url = url)
return DownloadAs(format = format, filename = createFilename(name, format), url = url)
}

private fun tryParseV1(obj: JsonObject, url: String?): DownloadAs? {
val type = obj[TYPE]?.jsonPrimitive?.contentOrNull
val filename = obj[FILENAME]?.jsonPrimitive?.contentOrNull
if (type == null || url == null) return null
return DownloadAs(format = type, filename = filename ?: "", url = url)
return DownloadAs(format = type, filename = createFilename(filename, type), url = url)
}

// TODO: add correct file format
private fun createFilename(filename: String?, format: String?): String {
return filename ?: ("document_${System.currentTimeMillis()}")
}
}
Loading