@@ -12,17 +12,14 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
1212import androidx.work.CoroutineWorker
1313import androidx.work.ForegroundInfo
1414import androidx.work.WorkerParameters
15- import com.nextcloud.client.account.User
1615import com.nextcloud.client.account.UserAccountManager
1716import com.nextcloud.client.jobs.download.FileDownloadHelper
1817import com.owncloud.android.datamodel.FileDataStorageManager
1918import com.owncloud.android.datamodel.OCFile
20- import com.owncloud.android.lib.common.OwnCloudClient
2119import com.owncloud.android.lib.common.OwnCloudClientManagerFactory
2220import com.owncloud.android.lib.common.utils.Log_OC
2321import com.owncloud.android.operations.DownloadFileOperation
2422import com.owncloud.android.operations.DownloadType
25- import com.owncloud.android.operations.RefreshFolderOperation
2623import com.owncloud.android.utils.FileStorageUtils
2724import com.owncloud.android.utils.theme.ViewThemeUtils
2825import kotlinx.coroutines.Dispatchers
@@ -101,8 +98,6 @@ class FolderDownloadWorker(
10198 notificationManager.showNotAvailableDiskSpace()
10299 return @withContext Result .failure()
103100 }
104- Log_OC .d(TAG , " 🔄 syncing full folder tree from server before collecting files" )
105- syncFolderRecursivelyFromServer(folder, user, client)
106101 }
107102
108103 val files = getFiles(folder, storageManager, syncAll)
@@ -175,50 +170,6 @@ class FolderDownloadWorker(
175170 }
176171 }
177172
178- private fun syncFolderRecursivelyFromServer (folder : OCFile , user : User , client : OwnCloudClient ) {
179- if (isStopped) return
180-
181- try {
182- Log_OC .d(TAG , " 🔄 refreshing from server: ${folder.remotePath} " )
183-
184- val operation = RefreshFolderOperation (
185- folder,
186- System .currentTimeMillis(),
187- false ,
188- true ,
189- false ,
190- storageManager,
191- user,
192- context
193- )
194-
195- val result = operation.execute(client)
196-
197- if (! result.isSuccess) {
198- Log_OC .w(TAG , " ⚠️ failed to refresh ${folder.remotePath} : ${result.logMessage} " )
199- return
200- }
201-
202- val refreshedFolder = storageManager.getFileById(folder.fileId) ? : run {
203- Log_OC .w(TAG , " ⚠️ folder ${folder.fileId} missing from DB after refresh" )
204- return
205- }
206-
207- val subFolders = storageManager
208- .getFolderContent(refreshedFolder, false )
209- .filter { it.isFolder }
210-
211- for (subFolder in subFolders) {
212- if (isStopped) return
213- syncFolderRecursivelyFromServer(subFolder, user, client)
214- }
215- } catch (e: Exception ) {
216- Log_OC .w(TAG , " ⚠️ exception syncing ${folder.remotePath} : $e " )
217- } finally {
218- Log_OC .d(TAG , " sub folders are fetched before downloading all" )
219- }
220- }
221-
222173 @Suppress(" ReturnCount" )
223174 override suspend fun getForegroundInfo (): ForegroundInfo {
224175 return try {
0 commit comments