athaliar/APKDownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DownloadWorker: simplify & improve code [2/2]

Browse Source
This commit is contained in:
Rahul Patel
2025-02-27 05:00:13 +05:30
parent 667017aec6
commit 46d4322976
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt
View File

@@ -344,17 +344,26 @@ class DownloadWorker @AssistedInject constructor(
if (!isStopped && !download.isFinished) { if (!isStopped && !download.isFinished) {
downloadedBytes += downloadInfo.bytesCopied downloadedBytes += downloadInfo.bytesCopied
val progress = (downloadedBytes * 100 / totalBytes).toInt() val progress = ((downloadedBytes * 100L) / totalBytes).toInt()
val bytesRemaining = totalBytes - downloadedBytes val bytesRemaining = totalBytes - downloadedBytes
val speed = if (downloadInfo.speed == 0L) 1 else downloadInfo.speed val speed = if (downloadInfo.speed == 0L) 1L else downloadInfo.speed
// Consider a 10% change in speed
val speedChanged = if (download.speed > 0) {
val speedDifference = kotlin.math.abs(download.speed - speed)
(speedDifference * 100.0 / download.speed) >= 10
} else {
// If previous speed was zero, any change matters
speed != download.speed
}
// Individual file progress can be negligible in contrast to total progress // Individual file progress can be negligible in contrast to total progress
// Only notify the UI if progress is greater or speed has changed to avoid being rate-limited by Android // Only notify the UI if progress/speed change considerably to avoid being rate-limited by Android
if (progress > totalProgress || speed != download.speed) { if ((progress - totalProgress) >= 5 || speedChanged) {
download.apply { download.apply {
this.progress = progress this.progress = progress
this.speed = downloadInfo.speed this.speed = speed
this.timeRemaining = bytesRemaining / speed * 1000 this.timeRemaining = (bytesRemaining / speed) * 1000
} }
downloadDao.updateProgress( downloadDao.updateProgress(

2
app/src/main/java/com/aurora/store/util/NotificationUtil.kt
View File

@@ -149,7 +149,7 @@ object NotificationUtil {
} else { } else {
context.getString( context.getString(
R.string.download_progress, R.string.download_progress,
download.downloadedFiles, download.downloadedFiles + 1,
download.totalFiles, download.totalFiles,
CommonUtil.humanReadableByteSpeed(download.speed, true) CommonUtil.humanReadableByteSpeed(download.speed, true)
) )