Cleanup all databases to remove dirty references

syncany · Aug 9, 2014 · edf841d · edf841d
1 parent 2456885
commit edf841d
Showing 1 changed file with 2 additions and 13 deletions.
diff --git a/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperation.java b/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperation.java
@@ -352,19 +352,8 @@ private void mergeRemoteFiles() throws IOException, StorageException {
 					new Object[] { clientDatabaseFiles.size(), MAX_KEEP_DATABASE_VERSIONS });
 
 			// 1. Determine files to delete remotely
-			List<DatabaseRemoteFile> toDeleteDatabaseFiles = new ArrayList<DatabaseRemoteFile>();
-			int numOfDatabaseFilesToDelete = clientDatabaseFiles.size() - 1;
-
-			// This client needs no merging
-			if (numOfDatabaseFilesToDelete == 0) {
-				continue;
-			}
-
-			for (DatabaseRemoteFile clientDatabaseFile : clientDatabaseFiles) {
-				if (toDeleteDatabaseFiles.size() <= numOfDatabaseFilesToDelete) {
-					toDeleteDatabaseFiles.add(clientDatabaseFile);
-				}
-			}
+			List<DatabaseRemoteFile> toDeleteDatabaseFiles = new ArrayList<DatabaseRemoteFile>(clientDatabaseFiles);
+
 
 			// 2. Write merge file
 			DatabaseRemoteFile lastRemoteMergeDatabaseFile = toDeleteDatabaseFiles.get(toDeleteDatabaseFiles.size() - 1);