fix file detection

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

app/src/main/java/com/nextcloud/client/database/dao/FileSystemDao.kt

@@ -66,4 +66,16 @@ interface FileSystemDao {
     """
     )
     fun getFileByPathAndFolder(localPath: String, syncedFolderId: String): FilesystemEntity?
+
+    @Query(
+        """
+    SELECT COUNT(*) > 0
+    FROM ${ProviderMeta.ProviderTableMeta.FILESYSTEM_TABLE_NAME}
+    WHERE ${ProviderMeta.ProviderTableMeta.FILESYSTEM_SYNCED_FOLDER_ID} = :syncedFolderId
+      AND ${ProviderMeta.ProviderTableMeta.FILESYSTEM_FILE_SENT_FOR_UPLOAD} = 0
+      AND ${ProviderMeta.ProviderTableMeta.FILESYSTEM_FILE_IS_FOLDER} = 0
+    LIMIT 1
+    """
+    )
+    suspend fun hasPendingFiles(syncedFolderId: String): Boolean
 }

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

@@ -182,7 +182,6 @@ class BackgroundJobFactory @Inject constructor(
         connectivityService = connectivityService,
         powerManagementService = powerManagementService,
         syncedFolderProvider = syncedFolderProvider,
-        backgroundJobManager = backgroundJobManager.get(),
         repository = FileSystemRepository(dao = database.fileSystemDao(), uploadsStorageManager, context),
         viewThemeUtils = viewThemeUtils.get(),
         localBroadcastManager = localBroadcastManager.get()

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

@@ -120,10 +120,7 @@ interface BackgroundJobManager {
 
     fun startImmediateFilesExportJob(files: Collection<OCFile>): LiveData<JobInfo?>
 
-    fun startAutoUpload(
-        syncedFolder: SyncedFolder,
-        overridePowerSaving: Boolean = false
-    )
+    fun startAutoUpload(syncedFolder: SyncedFolder, overridePowerSaving: Boolean = false)
 
     fun cancelTwoWaySyncJob()
 

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

@@ -474,10 +474,7 @@ internal class BackgroundJobManagerImpl(
         )
     }
 
-    override fun startAutoUpload(
-        syncedFolder: SyncedFolder,
-        overridePowerSaving: Boolean
-    ) {
+    override fun startAutoUpload(syncedFolder: SyncedFolder, overridePowerSaving: Boolean) {
         val syncedFolderID = syncedFolder.id
 
         val arguments = Data.Builder()

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

@@ -24,7 +24,7 @@ import kotlinx.coroutines.withContext
  * It fires media detection worker and auto upload worker and finishes immediately.
  *
  */
-@Suppress("TooGenericExceptionCaught")
+@Suppress("TooGenericExceptionCaught", "LongParameterList")
 class ContentObserverWork(
     context: Context,
     private val params: WorkerParameters,

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

@@ -58,7 +58,6 @@ class AutoUploadWorker(
     private val connectivityService: ConnectivityService,
     private val powerManagementService: PowerManagementService,
     private val syncedFolderProvider: SyncedFolderProvider,
-    private val backgroundJobManager: BackgroundJobManager,
     private val repository: FileSystemRepository,
     val viewThemeUtils: ViewThemeUtils,
     localBroadcastManager: LocalBroadcastManager
@@ -85,7 +84,6 @@ class AutoUploadWorker(
 
             Log_OC.d(TAG, syncedFolder.getLog())
 
-
             if (canExitEarly(syncFolderId)) {
                 return Result.success()
             }
@@ -171,7 +169,7 @@ class AutoUploadWorker(
     }
 
     @Suppress("ReturnCount")
-    private fun canExitEarly(syncedFolderID: Long): Boolean {
+    private suspend fun canExitEarly(syncedFolderID: Long): Boolean {
         val overridePowerSaving = inputData.getBoolean(OVERRIDE_POWER_SAVING, false)
         if ((powerManagementService.isPowerSavingEnabled && !overridePowerSaving)) {
             Log_OC.w(TAG, "⚡ Skipping: device is in power saving mode")
@@ -183,6 +181,12 @@ class AutoUploadWorker(
             return true
         }
 
+        val hasPendingFiles = repository.hasPendingFiles(syncedFolder)
+        if (hasPendingFiles) {
+            Log_OC.d(TAG, "pending files found, starting...")
+            return false
+        }
+
         val totalScanInterval = syncedFolder.getTotalScanInterval(connectivityService, powerManagementService)
         val currentTime = System.currentTimeMillis()
         val passedScanInterval = totalScanInterval <= currentTime

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

@@ -46,6 +46,8 @@ class FileSystemRepository(
         dao.delete(entity)
     }
 
+    suspend fun hasPendingFiles(syncedFolder: SyncedFolder): Boolean = dao.hasPendingFiles(syncedFolder.id.toString())
+
     suspend fun deleteByLocalPathAndId(path: String, id: Int) {
         dao.deleteByLocalPathAndId(path, id)
     }