diff --git a/app/src/androidTest/java/com/nextcloud/client/jobs/BackgroundJobManagerTest.kt b/app/src/androidTest/java/com/nextcloud/client/jobs/BackgroundJobManagerTest.kt index d59256f786c0..c5cdc3b44686 100644 --- a/app/src/androidTest/java/com/nextcloud/client/jobs/BackgroundJobManagerTest.kt +++ b/app/src/androidTest/java/com/nextcloud/client/jobs/BackgroundJobManagerTest.kt @@ -22,6 +22,7 @@ import com.nextcloud.client.account.User import com.nextcloud.client.core.Clock import com.nextcloud.utils.extensions.toByteArray import com.owncloud.android.lib.common.utils.Log_OC +import kotlinx.coroutines.flow.emptyFlow import org.apache.commons.io.FileUtils import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse @@ -99,6 +100,7 @@ class BackgroundJobManagerTest { user = mock() whenever(user.accountName).thenReturn(USER_ACCOUNT_NAME) workManager = mock() + whenever(workManager.getWorkInfosFlow(any())).thenReturn(emptyFlow()) clock = mock() whenever(clock.currentTime).thenReturn(TIMESTAMP) whenever(clock.currentDate).thenReturn(Date(TIMESTAMP)) diff --git a/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt b/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt index 54f3852d8763..7dd07ccfbe91 100644 --- a/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt +++ b/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt @@ -42,6 +42,7 @@ import com.nextcloud.client.jobs.worker.WorkerFilesPayload import com.nextcloud.client.network.SupportedNetworkTransports import com.nextcloud.client.preferences.AppPreferences import com.nextcloud.utils.extensions.isWorkScheduled +import com.nextcloud.utils.extensions.scheduledWorkInfos import com.owncloud.android.datamodel.OCFile import com.owncloud.android.datamodel.SyncedFolder import com.owncloud.android.lib.common.utils.Log_OC @@ -195,6 +196,8 @@ internal class BackgroundJobManagerImpl( private val defaultDispatcherScope = CoroutineScope(Dispatchers.Default) + private val scheduledWorkInfos = workManager.scheduledWorkInfos(defaultDispatcherScope) + override fun logStartOfWorker(workerName: String?) { val logs = deleteOldLogs(preferences.readLogEntry().toMutableList()) @@ -495,19 +498,19 @@ internal class BackgroundJobManagerImpl( private fun autoUploadWorkName(syncedFolderID: Long): String = JOB_IMMEDIATE_FILES_SYNC + "_" + syncedFolderID override fun isAutoUploadScheduled(syncedFolderID: Long): Boolean = - workManager.getWorkInfosForUniqueWork(autoUploadWorkName(syncedFolderID)) - .get() - .any { !it.state.isFinished } + scheduledWorkInfos.value.isWorkScheduled(formatNameTag(autoUploadWorkName(syncedFolderID))) private fun autoUploadIgnorePowerSavingTag(syncedFolderID: Long): String = autoUploadWorkName(syncedFolderID) + "_" + TAG_SUFFIX_IGNORE_POWER_SAVING override fun isAutoUploadIgnoringPowerSavingScheduled(syncedFolderID: Long): Boolean = - workManager.isWorkScheduled(autoUploadIgnorePowerSavingTag(syncedFolderID)) + scheduledWorkInfos.value.isWorkScheduled(autoUploadIgnorePowerSavingTag(syncedFolderID)) override fun cancelEnqueuedAutoUploads() { - workManager.getWorkInfosByTag(formatClassTag(AutoUploadWorker::class)) - .get() + val autoUploadClassTag = formatClassTag(AutoUploadWorker::class) + + scheduledWorkInfos.value + .filter { autoUploadClassTag in it.tags } .filter { it.state == WorkInfo.State.ENQUEUED && it.periodicityInfo != null } .forEach { workManager.cancelWorkById(it.id) } } @@ -660,7 +663,7 @@ internal class BackgroundJobManagerImpl( private fun startFileUploadJobTag(accountName: String): String = JOB_FILES_UPLOAD + accountName override fun isStartFileUploadJobScheduled(accountName: String): Boolean = - workManager.isWorkScheduled(startFileUploadJobTag(accountName)) + scheduledWorkInfos.value.isWorkScheduled(startFileUploadJobTag(accountName)) /** * This method supports initiating uploads for various scenarios, including: diff --git a/app/src/main/java/com/nextcloud/utils/extensions/WorkManagerExtensions.kt b/app/src/main/java/com/nextcloud/utils/extensions/WorkManagerExtensions.kt index 9a3a8b69c7b2..b85046e51de9 100644 --- a/app/src/main/java/com/nextcloud/utils/extensions/WorkManagerExtensions.kt +++ b/app/src/main/java/com/nextcloud/utils/extensions/WorkManagerExtensions.kt @@ -9,28 +9,19 @@ package com.nextcloud.utils.extensions import androidx.work.WorkInfo import androidx.work.WorkManager -import com.google.common.util.concurrent.ListenableFuture -import com.owncloud.android.lib.common.utils.Log_OC -import java.util.concurrent.ExecutionException +import androidx.work.WorkQuery +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.stateIn -private const val TAG = "WorkManager" +private val scheduledStates = listOf(WorkInfo.State.RUNNING, WorkInfo.State.ENQUEUED) -fun WorkManager.isWorkRunning(tag: String): Boolean = checkWork(tag, listOf(WorkInfo.State.RUNNING)) +fun WorkManager.scheduledWorkInfos(scope: CoroutineScope): StateFlow> = + getWorkInfosFlow(WorkQuery.fromStates(scheduledStates)) + .stateIn(scope, SharingStarted.Eagerly, emptyList()) -fun WorkManager.isWorkScheduled(tag: String): Boolean = - checkWork(tag, listOf(WorkInfo.State.RUNNING, WorkInfo.State.ENQUEUED)) +fun List.isWorkScheduled(tag: String): Boolean = hasWork(tag, scheduledStates) -private fun WorkManager.checkWork(tag: String, stateConditions: List): Boolean { - val statuses: ListenableFuture> = getWorkInfosByTag(tag) - var workInfoList: List = emptyList() - - try { - workInfoList = statuses.get() - } catch (e: ExecutionException) { - Log_OC.d(TAG, "ExecutionException in checkWork: $e") - } catch (e: InterruptedException) { - Log_OC.d(TAG, "InterruptedException in checkWork: $e") - } - - return workInfoList.any { workInfo -> stateConditions.contains(workInfo.state) } -} +private fun List.hasWork(tag: String, states: List): Boolean = + any { workInfo -> tag in workInfo.tags && workInfo.state in states }