Skip to content
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

fix(StatusProgress): Fix a crash occurring because of a division by 0 #444

Merged
merged 1 commit into from
Feb 28, 2025
Merged

fix(StatusProgress): Fix a crash occurring because of a division by 0 #444

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
24 changes: 12 additions & 12 deletions .../com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferDownloadComposeUi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import androidx.lifecycle.compose.LocalLifecycleOwner
import com.google.accompanist.permissions.ExperimentalPermissionsApi
import com.google.accompanist.permissions.PermissionState
import com.infomaniak.core.DownloadStatus
import com.infomaniak.core.DownloadStatus.InProgress
import com.infomaniak.core.autoCancelScope
import com.infomaniak.core.compose.basics.CallableState
import com.infomaniak.core.compose.basics.withForwardTo
Expand Down Expand Up @@ -222,7 +223,7 @@ class TransferDownloadComposeUi(
color = MaterialTheme.colorScheme.error,
)
}
is DownloadStatus.InProgress -> {
is InProgress -> {
DownloadProgressBar(rememberUpdatedState(status), modifier = modifier)
}
is DownloadStatus.Paused, DownloadStatus.Pending -> {
Expand All @@ -247,7 +248,7 @@ class TransferDownloadComposeUi(
is DownloadStatus.Failed -> {
button(ButtonData.failed, removalRequest) {}
}
is DownloadStatus.InProgress -> {
is InProgress -> {
button(ButtonData.downloading, removalRequest) {
DownloadProgress(rememberUpdatedState(status))
}
Expand Down Expand Up @@ -286,25 +287,24 @@ class TransferDownloadComposeUi(

@Composable
private fun DownloadProgressBar(
progressStatus: State<DownloadStatus.InProgress>,
progressStatus: State<InProgress>,
modifier: Modifier = Modifier,
) {
val status by progressStatus
LinearProgressIndicator(
progress = { status.let { it.downloadedBytes.toFloat() / it.totalSizeInBytes } },
modifier = modifier,
)
LinearProgressIndicator(progress = status::getProgress, modifier = modifier)
}

@Composable
private fun DownloadProgress(progressStatus: State<DownloadStatus.InProgress>) {
private fun DownloadProgress(progressStatus: State<InProgress>) {
val status by progressStatus
CircularProgressIndicator(
progress = { status.let { it.downloadedBytes.toFloat() / it.totalSizeInBytes } },
)
CircularProgressIndicator(progress = status::getProgress)
}
}

private fun InProgress.getProgress(): Float {
return (if (totalSizeInBytes == 0L) 0 else downloadedBytes / totalSizeInBytes).toFloat()
}

@OptIn(ExperimentalPermissionsApi::class)
@PreviewLightDark
@Composable
Expand All @@ -320,7 +320,7 @@ private fun Preview() = SwissTransferTheme {
LaunchedEffect(Unit) {
while (coroutineContext.isActive) autoCancelScope {
val statusFlow = flow {
emit(DownloadStatus.InProgress(downloadedBytes = 9_345_064L, totalSizeInBytes = 84_234_122L))
emit(InProgress(downloadedBytes = 9_345_064L, totalSizeInBytes = 84_234_122L))
awaitCancellation()
}.stateIn(scope = this)
ui.showStatusAndAwaitRemovalRequest(statusFlow, supportsPreview = false)
Expand Down