Browse Source

Simplify file visitor

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 8 years ago
parent
commit
60d2de4f0d
1 changed files with 4 additions and 17 deletions
  1. 4 17
      src/main/java/com/owncloud/android/utils/FilesSyncHelper.java

+ 4 - 17
src/main/java/com/owncloud/android/utils/FilesSyncHelper.java

@@ -57,10 +57,6 @@ import org.lukhnos.nnio.file.attribute.BasicFileAttributes;
 
 
 import java.io.File;
 import java.io.File;
 import java.io.IOException;
 import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
-import java.nio.channels.OverlappingFileLockException;
 import java.util.List;
 import java.util.List;
 
 
 public class FilesSyncHelper {
 public class FilesSyncHelper {
@@ -109,18 +105,9 @@ public class FilesSyncHelper {
                     public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) throws IOException {
                     public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) throws IOException {
 
 
                         File file = path.toFile();
                         File file = path.toFile();
-                        FileChannel channel = new RandomAccessFile(file, "rw").getChannel();
-                        FileLock lock = channel.lock();
-                        try {
-                            lock = channel.tryLock();
-                            filesystemDataProvider.storeOrUpdateFileValue(path.toAbsolutePath().toString(),
-                                    attrs.lastModifiedTime().toMillis(), file.isDirectory(), syncedFolder, dryRun);
-                        } catch (OverlappingFileLockException e) {
-                            filesystemDataProvider.storeOrUpdateFileValue(path.toAbsolutePath().toString(),
-                                    attrs.lastModifiedTime().toMillis(), file.isDirectory(), syncedFolder, dryRun);
-                        } finally {
-                            lock.release();
-                        }
+                        filesystemDataProvider.storeOrUpdateFileValue(path.toAbsolutePath().toString(),
+                                attrs.lastModifiedTime().toMillis(), file.isDirectory(), syncedFolder, dryRun);
+
 
 
                         return FileVisitResult.CONTINUE;
                         return FileVisitResult.CONTINUE;
                     }
                     }
@@ -150,7 +137,7 @@ public class FilesSyncHelper {
         for (SyncedFolder syncedFolder : syncedFolderProvider.getSyncedFolders()) {
         for (SyncedFolder syncedFolder : syncedFolderProvider.getSyncedFolders()) {
             if (syncedFolder.isEnabled()) {
             if (syncedFolder.isEnabled()) {
                 if (!skipCustom || MediaFolder.CUSTOM != syncedFolder.getType())
                 if (!skipCustom || MediaFolder.CUSTOM != syncedFolder.getType())
-                insertAllDBEntriesForSyncedFolder(syncedFolder);
+                    insertAllDBEntriesForSyncedFolder(syncedFolder);
             }
             }
         }
         }
     }
     }