Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 940af700 authored by vince-bourgmayer's avatar vince-bourgmayer
Browse files

cherry pick 2cf1ffc5

parent 79b3e0c6
Loading
Loading
Loading
Loading
Loading
+71 −74
Original line number Diff line number Diff line
@@ -64,16 +64,18 @@ public class ListFileRemoteOperation extends RemoteOperation {
            //Get CurrentSyncedFolder
            SyncedFolder syncedFolder = mSyncedFolderIterator.next();

            if(syncedFolder.isScanRemote()) {
            if(!syncedFolder.isScanRemote()) continue;

            if(syncedFolder.getId() == -1) {
                //persist new syncedFolder
                int syncedFolderId = (int) DbHelper.insertSyncedFolder(syncedFolder, mContext);
                if (syncedFolderId > 0) {
                    syncedFolder.setId(syncedFolderId);
                }else {
                    mSyncedFolderIterator.remove();
                    Log.w(TAG, "syncedFolder "+syncedFolder.getRemoteFolder()+" doesn't have a valid ID");
                }
            }
                if(syncedFolder.getId() > 0){
            //Create ReadRemoteOperation
            LightReadFolderRemoteOperation operation = new LightReadFolderRemoteOperation(syncedFolder.getRemoteFolder(), DEPTH_1, false);
            RemoteOperationResult result = operation.execute(ownCloudClient);
@@ -140,11 +142,6 @@ public class ListFileRemoteOperation extends RemoteOperation {
                }
                Log.w(TAG, "LightReadFolderRemoteOperation failed : http " + result.getHttpCode() + ", " + result.getLogMessage()+" => Ignored");
            }
                }else{
                    mSyncedFolderIterator.remove();
                    Log.w(TAG, "syncedFolder "+syncedFolder.getRemoteFolder()+" doesn't have a valid ID");
                }
            } //Then its folder is not scanRemote
        } //End of loop
        finalResult = new RemoteOperationResult(RemoteOperationResult.ResultCode.OK);