Browse Source

Fix inconsistencies

Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
Jonas Mayer 1 năm trước cách đây
mục cha
commit
fda6494049

+ 1 - 2
app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManager.kt

@@ -122,8 +122,7 @@ interface BackgroundJobManager {
     fun schedulePeriodicFilesSyncJob(syncedFolderID: Long)
 
     /**
-     * Immediately start File Sync job for given syncFolderID if provided. If no syncFolderID is provided, it will start
-     * the syncFolder job for all sync folders.
+     * Immediately start File Sync job for given syncFolderID.
      */
     fun startImmediateFilesSyncJob(
         syncedFolderID: Long,

+ 4 - 4
app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt

@@ -418,12 +418,12 @@ internal class BackgroundJobManagerImpl(
 
         val request = periodicRequestBuilder(
             jobClass = FilesSyncWork::class,
-            jobName = JOB_PERIODIC_FILES_SYNC,
+            jobName = JOB_PERIODIC_FILES_SYNC + "_" + syncedFolderID,
             intervalMins = DEFAULT_PERIODIC_JOB_INTERVAL_MINUTES
         )
             .setInputData(arguments)
             .build()
-        workManager.enqueueUniquePeriodicWork(JOB_PERIODIC_FILES_SYNC, ExistingPeriodicWorkPolicy.REPLACE, request)
+        workManager.enqueueUniquePeriodicWork(JOB_PERIODIC_FILES_SYNC + "_" + syncedFolderID, ExistingPeriodicWorkPolicy.REPLACE, request)
     }
 
     override fun startImmediateFilesSyncJob(
@@ -439,12 +439,12 @@ internal class BackgroundJobManagerImpl(
 
         val request = oneTimeRequestBuilder(
             jobClass = FilesSyncWork::class,
-            jobName = JOB_IMMEDIATE_FILES_SYNC
+            jobName = JOB_IMMEDIATE_FILES_SYNC + "_" + syncedFolderID
         )
             .setInputData(arguments)
             .build()
 
-        workManager.enqueueUniqueWork(JOB_IMMEDIATE_FILES_SYNC, ExistingWorkPolicy.APPEND, request)
+        workManager.enqueueUniqueWork(JOB_IMMEDIATE_FILES_SYNC + "_" + syncedFolderID, ExistingWorkPolicy.APPEND, request)
     }
 
     override fun scheduleOfflineSync() {

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

@@ -116,7 +116,7 @@ class FilesSyncWork(
 
         if (canExitEarly(changedFiles, syncFolderId)) {
             val result = Result.success()
-            backgroundJobManager.logEndOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class), result)
+            backgroundJobManager.logEndOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class) + "_" + syncFolderId, result)
             return result
         }
 
@@ -156,7 +156,7 @@ class FilesSyncWork(
 
         Log_OC.d(TAG, "File-sync worker (${syncedFolder.remotePath}) finished")
         val result = Result.success()
-        backgroundJobManager.logEndOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class), result)
+        backgroundJobManager.logEndOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class) + "_" + syncFolderId, result)
         return result
     }