Merge pull request #16668 from nextcloud/fix/auto-upload-instant-directory-scan

fix(auto-upload): instant directory scan

Author: alperozturk96

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

@@ -88,7 +88,7 @@ class BackgroundJobFactory @Inject constructor(
             when (workerClass) {
                 ContactsBackupWork::class -> createContactsBackupWork(context, workerParameters)
                 ContactsImportWork::class -> createContactsImportWork(context, workerParameters)
-                AutoUploadWorker::class -> createFilesSyncWork(context, workerParameters)
+                AutoUploadWorker::class -> createAutoUploadWorker(context, workerParameters)
                 OfflineSyncWork::class -> createOfflineSyncWork(context, workerParameters)
                 MediaFoldersDetectionWork::class -> createMediaFoldersDetectionWork(context, workerParameters)
                 NotificationWork::class -> createNotificationWork(context, workerParameters)
@@ -174,7 +174,7 @@ class BackgroundJobFactory @Inject constructor(
             contentResolver
         )
 
-    private fun createFilesSyncWork(context: Context, params: WorkerParameters): AutoUploadWorker = AutoUploadWorker(
+    private fun createAutoUploadWorker(context: Context, params: WorkerParameters): AutoUploadWorker = AutoUploadWorker(
         context = context,
         params = params,
         userAccountManager = accountManager,
@@ -184,7 +184,10 @@ class BackgroundJobFactory @Inject constructor(
         syncedFolderProvider = syncedFolderProvider,
         repository = FileSystemRepository(dao = database.fileSystemDao(), uploadsStorageManager, context),
         viewThemeUtils = viewThemeUtils.get(),
-        localBroadcastManager = localBroadcastManager.get()
+        localBroadcastManager = localBroadcastManager.get(),
+        autoUploadHelper = AutoUploadHelper(
+            FileSystemRepository(dao = database.fileSystemDao(), uploadsStorageManager, context)
+        )
     )
 
     private fun createOfflineSyncWork(context: Context, params: WorkerParameters): OfflineSyncWork = OfflineSyncWork(

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

@@ -90,6 +90,7 @@ class ContentObserverWork(
 
         Log_OC.d(TAG, "📄 Content uris detected")
 
+        // insert entries based on content uris
         try {
             syncedFolderProvider.syncedFolders
                 .filter { it.isEnabled }

app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt

@@ -62,7 +62,8 @@ class AutoUploadWorker(
     private val syncedFolderProvider: SyncedFolderProvider,
     private val repository: FileSystemRepository,
     val viewThemeUtils: ViewThemeUtils,
-    localBroadcastManager: LocalBroadcastManager
+    localBroadcastManager: LocalBroadcastManager,
+    private val autoUploadHelper: AutoUploadHelper
 ) : CoroutineWorker(context, params) {
 
     companion object {
@@ -97,6 +98,8 @@ class AutoUploadWorker(
                 Log_OC.w(TAG, "power saving mode enabled")
             }
 
+            // insert entries based on selected local storage path
+            autoUploadHelper.insertEntries(syncedFolder)
             uploadFiles(syncedFolder)
 
             // only update last scan time after uploading files