Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -242,11 +242,19 @@ private suspend fun buildDownloadRequest(
val fileName = DownloadManagerUtils.withoutProblematicCharacters(targetFile.fileName)
name = "SwissTransfer/$fileName${if (targetFile.isFolder) ".zip" else ""}"
}
else -> {
transfer.apiSource == TransferUi.ApiSource.V1 -> {
url = apiUrlCreator.downloadFilesUrl(transfer.uuid) ?: return null
val fileName = currentDateTimeWithSecondsString()
name = "SwissTransfer/$fileName.zip"
}
else -> return null
}

val extraHeaders = buildSet {
if (transfer.apiSource == TransferUi.ApiSource.V2) {
val password = transfer.password ?: return@buildSet
add("Transfer-Password" to password)
}
}

return runCatching {
Expand All @@ -255,6 +263,7 @@ private suspend fun buildDownloadRequest(
nameWithoutProblematicChars = name,
mimeType = Dispatchers.IO { FileType.guessMimeTypeFromFileName(name) },
userAgent = userAgent,
extraHeaders = extraHeaders,
)
}.cancellable().onFailure {
// Unlikely to happen since mitigation in requestFor, but we don't want to crash the app if it happens.
Expand Down
Loading