diff --git a/data/src/main/java/org/cryptomator/data/cloud/dropbox/DropboxImpl.java b/data/src/main/java/org/cryptomator/data/cloud/dropbox/DropboxImpl.java index f886857f..ed9234e1 100644 --- a/data/src/main/java/org/cryptomator/data/cloud/dropbox/DropboxImpl.java +++ b/data/src/main/java/org/cryptomator/data/cloud/dropbox/DropboxImpl.java @@ -195,7 +195,7 @@ class DropboxImpl { } public DropboxFile write(DropboxFile file, DataSource data, final ProgressAware progressAware, boolean replace, long size) throws AuthenticationException, DbxException, IOException, CloudNodeAlreadyExistsException { - if (exists(file) && !replace) { + if (!replace && exists(file)) { throw new CloudNodeAlreadyExistsException("CloudNode already exists and replace is false"); } diff --git a/data/src/main/java/org/cryptomator/data/cloud/local/file/LocalStorageImpl.java b/data/src/main/java/org/cryptomator/data/cloud/local/file/LocalStorageImpl.java index b893e5cd..ba973ebb 100644 --- a/data/src/main/java/org/cryptomator/data/cloud/local/file/LocalStorageImpl.java +++ b/data/src/main/java/org/cryptomator/data/cloud/local/file/LocalStorageImpl.java @@ -140,7 +140,7 @@ class LocalStorageImpl { } public LocalFile write(final CloudFile file, DataSource data, final ProgressAware progressAware, boolean replace, final long size) throws IOException, BackendException { - if (exists(file) && !replace) { + if (!replace && exists(file)) { throw new CloudNodeAlreadyExistsException("CloudNode already exists and replace is false"); } diff --git a/data/src/main/java/org/cryptomator/data/cloud/local/storageaccessframework/LocalStorageAccessFrameworkImpl.java b/data/src/main/java/org/cryptomator/data/cloud/local/storageaccessframework/LocalStorageAccessFrameworkImpl.java index 44f7cde6..1143a51e 100644 --- a/data/src/main/java/org/cryptomator/data/cloud/local/storageaccessframework/LocalStorageAccessFrameworkImpl.java +++ b/data/src/main/java/org/cryptomator/data/cloud/local/storageaccessframework/LocalStorageAccessFrameworkImpl.java @@ -427,7 +427,7 @@ class LocalStorageAccessFrameworkImpl { progressAware.onProgress(Progress.started(UploadState.upload(file))); Optional fileUri = existingFileUri(file); - if (fileUri.isPresent() && !replace) { + if (!replace && fileUri.isPresent()) { throw new CloudNodeAlreadyExistsException("CloudNode already exists and replace is false"); } diff --git a/data/src/main/java/org/cryptomator/data/cloud/onedrive/OnedriveImpl.java b/data/src/main/java/org/cryptomator/data/cloud/onedrive/OnedriveImpl.java index c104da55..f6c7ef62 100644 --- a/data/src/main/java/org/cryptomator/data/cloud/onedrive/OnedriveImpl.java +++ b/data/src/main/java/org/cryptomator/data/cloud/onedrive/OnedriveImpl.java @@ -242,7 +242,7 @@ class OnedriveImpl { } public OnedriveFile write(final OnedriveFile file, DataSource data, final ProgressAware progressAware, boolean replace, final long size) throws BackendException { - if (exists(file) && !replace) { + if (!replace && exists(file)) { throw new CloudNodeAlreadyExistsException("CloudNode already exists and replace is false"); } diff --git a/data/src/main/java/org/cryptomator/data/cloud/webdav/WebDavImpl.java b/data/src/main/java/org/cryptomator/data/cloud/webdav/WebDavImpl.java index 4d4a3dcc..9a6d49a7 100644 --- a/data/src/main/java/org/cryptomator/data/cloud/webdav/WebDavImpl.java +++ b/data/src/main/java/org/cryptomator/data/cloud/webdav/WebDavImpl.java @@ -138,7 +138,7 @@ class WebDavImpl { public WebDavFile write(final WebDavFile uploadFile, DataSource data, final ProgressAware progressAware, boolean replace, final long size) // throws BackendException, IOException { - if (exists(uploadFile) && !replace) { + if (!replace && exists(uploadFile)) { throw new CloudNodeAlreadyExistsException("CloudNode already exists and replace is false"); } diff --git a/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.java b/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.java index 1eedb5ed..a13487f8 100644 --- a/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.java +++ b/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.java @@ -255,7 +255,7 @@ class GoogleDriveImpl { public GoogleDriveFile write(final GoogleDriveFile file, DataSource data, final ProgressAware progressAware, boolean replace, final long size) // throws IOException, BackendException { - if (exists(file) && !replace) { + if (!replace && exists(file)) { throw new CloudNodeAlreadyExistsException("CloudNode already exists and replace is false"); }