Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-26 22:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix downloading outgoing media view.

Browse Source
This commit is contained in:
Nicholas Tinsley
2023-10-10 17:52:54 -04:00
parent 2785609481
commit 157d194cc5
1 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
app/src/main/java/org/thoughtcrime/securesms/components/transfercontrols/TransferControlView.kt
View File

@@ -95,34 +95,56 @@ class TransferControlView @JvmOverloads constructor(context: Context, attrs: Att
val slide = currentState.slides.first()
if (slide.hasVideo()) {
if (currentState.isOutgoing) {
return if (slide.transferState == AttachmentTable.TRANSFER_PROGRESS_STARTED) {
Mode.UPLOADING_SINGLE_ITEM
} else {
Mode.RETRY_UPLOADING
return when (slide.transferState) {
AttachmentTable.TRANSFER_PROGRESS_STARTED -> {
Mode.UPLOADING_SINGLE_ITEM
}
AttachmentTable.TRANSFER_PROGRESS_PENDING -> {
Mode.PENDING_SINGLE_ITEM
}
else -> {
Mode.RETRY_UPLOADING
}
}
} else {
return if (slide.transferState == AttachmentTable.TRANSFER_PROGRESS_STARTED) {
if (currentState.playableWhileDownloading) {
Mode.DOWNLOADING_VIDEO_PLAYABLE
} else {
Mode.DOWNLOADING_SINGLE_ITEM
return when (slide.transferState) {
AttachmentTable.TRANSFER_PROGRESS_STARTED -> {
if (currentState.playableWhileDownloading) {
Mode.DOWNLOADING_VIDEO_PLAYABLE
} else {
Mode.DOWNLOADING_SINGLE_ITEM
}
}
} else if (slide.transferState == AttachmentTable.TRANSFER_PROGRESS_FAILED) {
Mode.RETRY_DOWNLOADING
} else {
if (currentState.playableWhileDownloading) {
Mode.PENDING_VIDEO_PLAYABLE
} else {
Mode.PENDING_SINGLE_ITEM
AttachmentTable.TRANSFER_PROGRESS_FAILED -> {
Mode.RETRY_DOWNLOADING
}
else -> {
if (currentState.playableWhileDownloading) {
Mode.PENDING_VIDEO_PLAYABLE
} else {
Mode.PENDING_SINGLE_ITEM
}
}
}
}
} else {
return if (currentState.isOutgoing) {
if (slide.transferState == AttachmentTable.TRANSFER_PROGRESS_STARTED) {
Mode.UPLOADING_SINGLE_ITEM
} else {
Mode.RETRY_UPLOADING
when (slide.transferState) {
AttachmentTable.TRANSFER_PROGRESS_FAILED -> {
Mode.RETRY_UPLOADING
}
AttachmentTable.TRANSFER_PROGRESS_PENDING -> {
Mode.PENDING_SINGLE_ITEM
}
else -> {
Mode.UPLOADING_SINGLE_ITEM
}
}
} else {
return when (slide.transferState) {