From 737570e723acf23adfdf432b15a5d630736329f9 Mon Sep 17 00:00:00 2001 From: Jonas Mayer Date: Thu, 18 Jan 2024 13:49:36 +0100 Subject: [PATCH] Fix to many returns in doWork Signed-off-by: Jonas Mayer --- .../java/com/nextcloud/client/jobs/FilesSyncWork.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt b/app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt index 6dc14e587331..2589d6b2a297 100644 --- a/app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt +++ b/app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt @@ -102,16 +102,16 @@ class FilesSyncWork( @Suppress("MagicNumber") override suspend fun doWork(): Result { - if (backgroundJobManager.bothFilesSyncJobsRunning()) { - Log_OC.d(TAG, "Kill Sync Worker since another instance of the worker seems to be running already!") - return Result.success() - } backgroundJobManager.logStartOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class)) setForeground(createForegroundInfo(0)) + // If we are in power save mode or sync worker already running, better to postpone upload val overridePowerSaving = inputData.getBoolean(OVERRIDE_POWER_SAVING, false) - // If we are in power save mode, better to postpone upload - if (powerManagementService.isPowerSavingEnabled && !overridePowerSaving) { + val alreadyRunning = backgroundJobManager.bothFilesSyncJobsRunning() + if ((powerManagementService.isPowerSavingEnabled && !overridePowerSaving) || alreadyRunning) { + if (alreadyRunning) { + Log_OC.d(TAG, "Kill Sync Worker since another instance of the worker seems to be running already!") + } val result = Result.success() backgroundJobManager.logEndOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class), result) return result