mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 15:15:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix spotless

Browse source 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
This commit is contained in:
Jonas Mayer 2024-05-16 19:54:24 +02:00 committed by Jonas Mayer
parent 46eaf83a5a
commit 8bb1eaaf2e
5 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -128,7 +128,7 @@ interface BackgroundJobManager {
fun startImmediateFilesSyncJob( fun startImmediateFilesSyncJob(
syncedFolderID: Long, syncedFolderID: Long,
overridePowerSaving: Boolean = false, overridePowerSaving: Boolean = false,
changedFiles: Array<String> = arrayOf<String>(), changedFiles: Array<String> = arrayOf<String>()
) )
fun scheduleOfflineSync() fun scheduleOfflineSync()

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

@ -405,8 +405,8 @@ internal class BackgroundJobManagerImpl(
} }
override fun bothFilesSyncJobsRunning(syncedFolderID: Long): Boolean { override fun bothFilesSyncJobsRunning(syncedFolderID: Long): Boolean {
return workManager.isWorkRunning(JOB_PERIODIC_FILES_SYNC+"_"+syncedFolderID) && return workManager.isWorkRunning(JOB_PERIODIC_FILES_SYNC + "_" + syncedFolderID) &&
workManager.isWorkRunning(JOB_IMMEDIATE_FILES_SYNC+"_"+syncedFolderID) workManager.isWorkRunning(JOB_IMMEDIATE_FILES_SYNC + "_" + syncedFolderID)
} }
override fun schedulePeriodicFilesSyncJob( override fun schedulePeriodicFilesSyncJob(
@ -429,7 +429,7 @@ internal class BackgroundJobManagerImpl(
override fun startImmediateFilesSyncJob( override fun startImmediateFilesSyncJob(
syncedFolderID: Long, syncedFolderID: Long,
overridePowerSaving: Boolean, overridePowerSaving: Boolean,
changedFiles: Array<String>, changedFiles: Array<String>
) { ) {
val arguments = Data.Builder() val arguments = Data.Builder()
.putBoolean(FilesSyncWork.OVERRIDE_POWER_SAVING, overridePowerSaving) .putBoolean(FilesSyncWork.OVERRIDE_POWER_SAVING, overridePowerSaving)

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

@ -54,7 +54,12 @@ class ContentObserverWork(
for (uri in params.triggeredContentUris) { for (uri in params.triggeredContentUris) {
changedFiles.add(uri.toString()) changedFiles.add(uri.toString())
} }
FilesSyncHelper.startFilesSyncForAllFolders(syncedFolderProvider, backgroundJobManager, false, changedFiles.toTypedArray()) FilesSyncHelper.startFilesSyncForAllFolders(
syncedFolderProvider,
backgroundJobManager,
false,
changedFiles.toTypedArray()
)
} }
} }

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

@ -64,7 +64,6 @@ class FilesSyncWork(
private lateinit var syncedFolder: SyncedFolder private lateinit var syncedFolder: SyncedFolder
@Suppress("ReturnCount") @Suppress("ReturnCount")
private fun canExitEarly(changedFiles: Array<String>?, syncedFolderID: Long): Boolean { private fun canExitEarly(changedFiles: Array<String>?, syncedFolderID: Long): Boolean {
// If we are in power save mode better to postpone scan and upload // If we are in power save mode better to postpone scan and upload
@ -81,18 +80,21 @@ class FilesSyncWork(
// or sync worker already running and no changed files to be processed // or sync worker already running and no changed files to be processed
val alreadyRunning = backgroundJobManager.bothFilesSyncJobsRunning(syncedFolderID) val alreadyRunning = backgroundJobManager.bothFilesSyncJobsRunning(syncedFolderID)
if (alreadyRunning && changedFiles.isNullOrEmpty()) { if (alreadyRunning && changedFiles.isNullOrEmpty()) {
Log_OC.d(TAG, "File-sync kill worker since another instance of the worker ($syncedFolderID) seems to be running already!") Log_OC.d(
TAG,
"File-sync kill worker since another instance of the worker " +
"($syncedFolderID) seems to be running already!"
)
return true return true
} }
val syncedFolderTmp = syncedFolderProvider.getSyncedFolderByID(syncedFolderID) val syncedFolderTmp = syncedFolderProvider.getSyncedFolderByID(syncedFolderID)
if (syncedFolderTmp == null || !syncedFolderTmp.isEnabled || !syncedFolderTmp.isExisting) { if (syncedFolderTmp == null || !syncedFolderTmp.isEnabled || !syncedFolderTmp.isExisting) {
Log_OC.d(TAG, "File-sync kill worker since syncedFolder (${syncedFolderID}) is not enabled!") Log_OC.d(TAG, "File-sync kill worker since syncedFolder ($syncedFolderID) is not enabled!")
return true return true
} }
syncedFolder = syncedFolderTmp syncedFolder = syncedFolderTmp
if (syncedFolder.isChargingOnly && if (syncedFolder.isChargingOnly &&
!powerManagementService.battery.isCharging && !powerManagementService.battery.isCharging &&
!powerManagementService.battery.isFull !powerManagementService.battery.isFull
@ -109,7 +111,7 @@ class FilesSyncWork(
val syncFolderId = inputData.getLong(SYNCED_FOLDER_ID, -1) val syncFolderId = inputData.getLong(SYNCED_FOLDER_ID, -1)
val changedFiles = inputData.getStringArray(CHANGED_FILES) val changedFiles = inputData.getStringArray(CHANGED_FILES)
backgroundJobManager.logStartOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class)+"_"+syncFolderId) backgroundJobManager.logStartOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class) + "_" + syncFolderId)
Log_OC.d(TAG, "File-sync worker started for folder ID: $syncFolderId") Log_OC.d(TAG, "File-sync worker started for folder ID: $syncFolderId")
if (canExitEarly(changedFiles, syncFolderId)) { if (canExitEarly(changedFiles, syncFolderId)) {
@ -128,7 +130,11 @@ class FilesSyncWork(
) )
// Get changed files from ContentObserverWork (only images and videos) or by scanning filesystem // Get changed files from ContentObserverWork (only images and videos) or by scanning filesystem
Log_OC.d(TAG, "File-sync worker (${syncedFolder.remotePath}) changed files from observer: " + changedFiles.contentToString()) Log_OC.d(
TAG,
"File-sync worker (${syncedFolder.remotePath}) changed files from observer: " +
changedFiles.contentToString()
)
collectChangedFiles(changedFiles) collectChangedFiles(changedFiles)
Log_OC.d(TAG, "File-sync worker (${syncedFolder.remotePath}) finished checking files.") Log_OC.d(TAG, "File-sync worker (${syncedFolder.remotePath}) finished checking files.")

2
app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt
View file

@ -571,7 +571,7 @@ class SyncedFoldersActivity :
} }
} }
if (syncedFolderDisplayItem.isEnabled) { if (syncedFolderDisplayItem.isEnabled) {
backgroundJobManager.startImmediateFilesSyncJob(syncedFolderDisplayItem.id ,overridePowerSaving = false) backgroundJobManager.startImmediateFilesSyncJob(syncedFolderDisplayItem.id, overridePowerSaving = false)
showBatteryOptimizationInfo() showBatteryOptimizationInfo()
} }
} }