Fix to many returns in doWork

Signed-off-by: Jonas Mayer <[email protected]>

app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt

@@ -94,15 +94,15 @@ class FilesSyncWork(
 
     @Suppress("MagicNumber")
     override 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))
 
+        // 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