Skip to content

chore: Update for download of v2 transfers #596

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

Closed
LouisCAD wants to merge 1 commit into from
Closed

chore: Update for download of v2 transfers #596

Show file tree
Hide file tree
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
12 changes: 6 additions & 6 deletions ...main/java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferDownload.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,18 @@ suspend fun handleTransferDownload(
}
downloadManager.cancelAndRemove(id)
transferManager.writeDownloadManagerId(
transferUUID = transfer.uuid,
transfer = transfer,
fileUid = targetFile?.uid,
uniqueDownloadManagerId = null,
)
}.let { awaitCancellation() /* Should never reach this line. */ }

fun downloadManagerId(
transferManager: TransferManager,
transferUuid: String,
transfer: TransferUi,
fileUid: String?,
): Flow<UniqueDownloadId?> = transferManager.downloadManagerIdFor(
transferUUID = transferUuid,
transfer = transfer,
fileUid = fileUid,
).map { UniqueDownloadId(it ?: return@map null) }

Expand Down Expand Up @@ -139,7 +139,7 @@ private fun currentOrNewDownloadManagerId(
direction: TransferDirection?,
): Flow<UniqueDownloadId> = downloadManagerId(
transferManager = transferManager,
transferUuid = transfer.uuid,
transfer = transfer,
fileUid = targetFile?.uid,
).mapLatest { id ->
id ?: repeatWhileActive {
Expand Down Expand Up @@ -203,7 +203,7 @@ private suspend fun getNewDownloadId(
val request = buildDownloadRequest(transfer, targetFile, apiUrlCreator, userAgent, direction) ?: return null
val newId = downloadManager.startDownloadingFile(request)
transferManager.writeDownloadManagerId(
transferUUID = transfer.uuid,
transfer = transfer,
fileUid = targetFile?.uid,
uniqueDownloadManagerId = newId?.value,
)
Expand Down Expand Up @@ -238,7 +238,7 @@ private suspend fun buildDownloadRequest(

when {
targetFile != null -> {
url = apiUrlCreator.downloadFileUrl(transfer.uuid, targetFile.uid) ?: return null
url = apiUrlCreator.downloadFileUrl(transfer, targetFile.uid) ?: return null
val fileName = DownloadManagerUtils.withoutProblematicCharacters(targetFile.fileName)
name = "SwissTransfer/$fileName${if (targetFile.isFolder) ".zip" else ""}"
}
Expand Down
2 changes: 1 addition & 1 deletion ...in/java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferManagerExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ fun TransferManager.previewUriForFile(
thumbnailsLocalStorage: ThumbnailsLocalStorage,
): Flow<Uri?> = downloadManagerId(
transferManager = this,
transferUuid = transfer.uuid,
transfer = transfer,
fileUid = file.uid,
).transformLatest { uniqueDownloadId ->
if (file.thumbnailPath != null) {
Expand Down
Loading