From 93f5b9176cf30efd418fa8db168849f92f8df264 Mon Sep 17 00:00:00 2001 From: Pim Otte Date: Fri, 8 Aug 2014 16:20:11 +0200 Subject: [PATCH] Removing MIN_KEEP_DATABASE_VERSIONS --- .../org/syncany/operations/cleanup/CleanupOperation.java | 5 ++--- 1 file changed, 2 insertions(+), 3 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 index ae67919cd..1c64886bc 100644 --- a/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperation.java +++ b/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperation.java @@ -80,8 +80,7 @@ public class CleanupOperation extends AbstractTransferOperation { private static final Logger logger = Logger.getLogger(CleanupOperation.class.getSimpleName()); public static final String ACTION_ID = "cleanup"; - // Minimal number of database versions per client - public static final int MIN_KEEP_DATABASE_VERSIONS = 5; + // Maximal number of database versions per client public static final int MAX_KEEP_DATABASE_VERSIONS = 15; @@ -351,7 +350,7 @@ private void mergeRemoteFiles() throws IOException, StorageException { // 1. Determine files to delete remotely List toDeleteDatabaseFiles = new ArrayList(); - int numOfDatabaseFilesToDelete = Math.max(clientDatabaseFiles.size() - MIN_KEEP_DATABASE_VERSIONS, 0); + int numOfDatabaseFilesToDelete = clientDatabaseFiles.size() - 1, 0; // This client needs no merging if (numOfDatabaseFilesToDelete == 0) {