diff --git a/app/src/main/java/com/aurora/store/data/receiver/PackageManagerReceiver.kt b/app/src/main/java/com/aurora/store/data/receiver/PackageManagerReceiver.kt index 94fb45b1a..75279fb5a 100644 --- a/app/src/main/java/com/aurora/store/data/receiver/PackageManagerReceiver.kt +++ b/app/src/main/java/com/aurora/store/data/receiver/PackageManagerReceiver.kt @@ -59,7 +59,7 @@ open class PackageManagerReceiver : BroadcastReceiver() { EventBus.getDefault().post(InstallEvent(packageName, "")) downloadWorkerUtil.downloadsList.filter { it.isNotEmpty() }.firstOrNull() - ?.find { it.packageName == packageName && it.status == DownloadStatus.COMPLETED } + ?.find { it.packageName == packageName && it.downloadStatus == DownloadStatus.COMPLETED } ?.let { notifyInstallation(context, it) if (Preferences.getBoolean(context, PREFERENCE_AUTO_DELETE)) { diff --git a/app/src/main/java/com/aurora/store/data/room/download/Download.kt b/app/src/main/java/com/aurora/store/data/room/download/Download.kt index c85a12426..bf6891ab5 100644 --- a/app/src/main/java/com/aurora/store/data/room/download/Download.kt +++ b/app/src/main/java/com/aurora/store/data/room/download/Download.kt @@ -19,7 +19,7 @@ data class Download( val iconURL: String, val size: Long, val id: Int, - var status: DownloadStatus, + var downloadStatus: DownloadStatus, var progress: Int, var speed: Long, var timeRemaining: Long, @@ -28,7 +28,7 @@ data class Download( var fileList: List, val sharedLibs: List ) : Parcelable { - val isFinished get() = status in DownloadStatus.finished + val isFinished get() = downloadStatus in DownloadStatus.finished companion object { fun fromApp(app: App): Download { diff --git a/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt b/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt index 5d51f6ae0..b70482793 100644 --- a/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt +++ b/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt @@ -283,7 +283,7 @@ class DownloadWorker @AssistedInject constructor( } download.apply { - this.status = DownloadStatus.DOWNLOADING + this.downloadStatus = DownloadStatus.DOWNLOADING this.progress = progress this.speed = downloadInfo.speed this.timeRemaining = bytesRemaining / speed * 1000 @@ -313,8 +313,8 @@ class DownloadWorker @AssistedInject constructor( // Update database for all status except downloading which is handled onProgress if (status != DownloadStatus.DOWNLOADING) { download.apply { - this.status = status - if (download.status == DownloadStatus.COMPLETED) this.progress = 100 + this.downloadStatus = status + if (download.downloadStatus == DownloadStatus.COMPLETED) this.progress = 100 } downloadDao.update(download) } diff --git a/app/src/main/java/com/aurora/store/util/DownloadWorkerUtil.kt b/app/src/main/java/com/aurora/store/util/DownloadWorkerUtil.kt index 38187fbdf..72ee93287 100644 --- a/app/src/main/java/com/aurora/store/util/DownloadWorkerUtil.kt +++ b/app/src/main/java/com/aurora/store/util/DownloadWorkerUtil.kt @@ -54,8 +54,8 @@ class DownloadWorkerUtil @Inject constructor( downloadDao.downloads() .collectLatest { list -> // Check and trigger next download in queue, if any - if (!list.any { it.status == DownloadStatus.DOWNLOADING }) { - val enqueuedDownloads = list.filter { it.status == DownloadStatus.QUEUED } + if (!list.any { it.downloadStatus == DownloadStatus.DOWNLOADING }) { + val enqueuedDownloads = list.filter { it.downloadStatus == DownloadStatus.QUEUED } enqueuedDownloads.firstOrNull()?.let { try { if (context.isIgnoringBatteryOptimizations() || CommonUtil.inForeground()) { @@ -83,8 +83,8 @@ class DownloadWorkerUtil @Inject constructor( Log.i(TAG, "Cancelling download for $packageName") WorkManager.getInstance(context).cancelAllWorkByTag("$PACKAGE_NAME:$packageName") downloadsList.filter { it.isNotEmpty() }.firstOrNull() - ?.find { it.packageName == packageName && it.status == DownloadStatus.QUEUED } - ?.let { downloadDao.update(it.copy(status = DownloadStatus.CANCELLED)) } + ?.find { it.packageName == packageName && it.downloadStatus == DownloadStatus.QUEUED } + ?.let { downloadDao.update(it.copy(downloadStatus = DownloadStatus.CANCELLED)) } } suspend fun clearDownload(packageName: String, versionCode: Int) { @@ -102,8 +102,8 @@ class DownloadWorkerUtil @Inject constructor( suspend fun cancelAll(downloads: Boolean = true, updates: Boolean = true) { // Cancel all enqueued downloads first to avoid triggering re-download - downloadsList.value.filter { it.status == DownloadStatus.QUEUED }.forEach { - downloadDao.update(it.copy(status = DownloadStatus.CANCELLED)) + downloadsList.value.filter { it.downloadStatus == DownloadStatus.QUEUED }.forEach { + downloadDao.update(it.copy(downloadStatus = DownloadStatus.CANCELLED)) } val workManager = WorkManager.getInstance(context) diff --git a/app/src/main/java/com/aurora/store/util/NotificationUtil.kt b/app/src/main/java/com/aurora/store/util/NotificationUtil.kt index 0644fa966..59e2514da 100644 --- a/app/src/main/java/com/aurora/store/util/NotificationUtil.kt +++ b/app/src/main/java/com/aurora/store/util/NotificationUtil.kt @@ -96,7 +96,7 @@ object NotificationUtil { builder.setContentIntent(getContentIntentForDownloads(context)) builder.setLargeIcon(largeIcon) - when (download.status) { + when (download.downloadStatus) { DownloadStatus.CANCELLED -> { builder.setSmallIcon(R.drawable.ic_download_cancel) builder.setContentText(context.getString(R.string.download_canceled)) diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt index d53c9766a..b4c284bd8 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt @@ -33,9 +33,6 @@ import com.aurora.store.data.room.download.Download import com.aurora.store.databinding.ViewDownloadBinding import com.aurora.store.util.CommonUtil.getDownloadSpeedString import com.aurora.store.util.CommonUtil.getETAString -import com.google.gson.Gson -import com.google.gson.GsonBuilder -import java.lang.reflect.Modifier import java.util.Locale @ModelView( @@ -75,7 +72,7 @@ class DownloadView : RelativeLayout { } B.txtTitle.text = download.displayName - B.txtStatus.text = download.status.name + B.txtStatus.text = download.downloadStatus.name .lowercase(Locale.getDefault()) .replaceFirstChar { if (it.isLowerCase()) { @@ -97,7 +94,7 @@ class DownloadView : RelativeLayout { download.speed ) - when (download.status) { + when (download.downloadStatus) { DownloadStatus.DOWNLOADING, DownloadStatus.QUEUED -> { B.txtSpeed.visibility = VISIBLE B.txtEta.visibility = VISIBLE diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt index ec1042653..e973ff853 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt @@ -108,9 +108,9 @@ class AppUpdateView : RelativeLayout { fun download(download: Download?) { if (download != null) { /*Inflate Download details*/ - B.btnAction.updateState(download.status) + B.btnAction.updateState(download.downloadStatus) B.progressDownload.isIndeterminate = download.progress < 1 - when (download.status) { + when (download.downloadStatus) { DownloadStatus.QUEUED -> { B.progressDownload.progress = 0 B.progressDownload.show() diff --git a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt index 885ae0435..41d30893d 100644 --- a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt @@ -25,7 +25,6 @@ import android.content.ActivityNotFoundException import android.content.Intent import android.content.pm.PackageManager import android.net.Uri -import android.os.Build import android.os.Bundle import android.os.Environment import android.provider.Settings @@ -246,10 +245,10 @@ class AppDetailsFragment : BaseFragment(R.layout.fragment_details) { .collectLatest { downloadsList -> val download = downloadsList.find { it.packageName == app.packageName } download?.let { - downloadStatus = it.status + downloadStatus = it.downloadStatus if (it.isFinished) flip(0) else flip(1) - when (it.status) { + when (it.downloadStatus) { DownloadStatus.QUEUED -> { updateProgress(it.progress) }