From 7db5ab0b6a75c69e725045a9590df1bc475f8539 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Tue, 31 May 2022 03:25:00 +0200 Subject: [PATCH] Clean up --- .../looker/droidify/service/SyncService.kt | 1 + .../looker/droidify/ui/fragments/AppSheetX.kt | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/com/looker/droidify/service/SyncService.kt b/src/main/kotlin/com/looker/droidify/service/SyncService.kt index 237276b5..1fbcba97 100644 --- a/src/main/kotlin/com/looker/droidify/service/SyncService.kt +++ b/src/main/kotlin/com/looker/droidify/service/SyncService.kt @@ -153,6 +153,7 @@ class SyncService : ConnectionService() { handleNextTask(false) } } else { + // TODO if disable then refresh app lists cancelTasks { it.repositoryId == repository.id } val cancelledTask = cancelCurrentTask { it.task?.repositoryId == repository.id } handleNextTask(cancelledTask?.hasUpdates == true) diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/AppSheetX.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/AppSheetX.kt index c204b101..d90ed9fe 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/AppSheetX.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/AppSheetX.kt @@ -48,6 +48,7 @@ import com.looker.droidify.entity.Cancelable import com.looker.droidify.entity.Connecting import com.looker.droidify.entity.Details import com.looker.droidify.entity.DonateType +import com.looker.droidify.entity.Downloading import com.looker.droidify.entity.Install import com.looker.droidify.entity.Launch import com.looker.droidify.entity.PackageState @@ -245,23 +246,23 @@ class AppSheetX() : FullscreenBottomSheetDialogFragment(), Callbacks { } } - private suspend fun updateDownloadState(state: DownloadService.State?) { - val status = when (state) { + private suspend fun updateDownloadState(downloadState: DownloadService.State?) { + val packageState = when (downloadState) { is DownloadService.State.Pending -> Pending is DownloadService.State.Connecting -> Connecting - is DownloadService.State.Downloading -> com.looker.droidify.entity.Downloading( - state.read, - state.total + is DownloadService.State.Downloading -> Downloading( + downloadState.read, + downloadState.total ) else -> null } - val downloading = status is Cancelable + val downloading = packageState is Cancelable this.downloading = downloading - viewModel.state.value = state + viewModel.state.value = packageState updateButtons() - if (state is DownloadService.State.Success && isResumed && !rootInstallerEnabled) { + if (downloadState is DownloadService.State.Success && isResumed && !rootInstallerEnabled) { withContext(Dispatchers.Default) { - AppInstaller.getInstance(context)?.defaultInstaller?.install(state.release.cacheFileName) + AppInstaller.getInstance(context)?.defaultInstaller?.install(downloadState.release.cacheFileName) } } }