Skip to content

fix(auto-upload): instant directory scan #16668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alperozturk96 merged 1 commit into from
Mar 12, 2026
Merged

fix(auto-upload): instant directory scan #16668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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,
Expand All @@ -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(
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/nextcloud/client/jobs/ContentObserverWork.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down
Loading