AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fix(S3): make sure the build works

Browse Source
This commit is contained in:
Manuel Jenny 2021-04-20 14:05:07 +02:00
parent bc3c0adba5
commit 24e96b7205
No known key found for this signature in database
GPG Key ID: 1C80FE62B2BEAA18
1 changed files with 35 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
data/src/main/java/org/cryptomator/data/cloud/s3/S3Impl.java
View File

@ -158,22 +158,12 @@ class S3Impl {
throw new CloudNodeAlreadyExistsException(target.getName());
}
try {
if (source instanceof S3Folder) {
return S3CloudNodeFactory.from(target.getParent(), client().moveFolder(source.getPath(), target.getPath()).execute());
} else {
return S3CloudNodeFactory.from(target.getParent(), client().moveFile(source.getPath(), target.getPath()).execute());
}
} catch (ApiError ex) {
if (PCloudApiError.isCloudNodeAlreadyExistsException(ex.errorCode())) {
throw new CloudNodeAlreadyExistsException(target.getName());
} else if (PCloudApiError.isNoSuchCloudFileException(ex.errorCode())) {
throw new NoSuchCloudFileException(source.getName());
} else {
handleApiError(ex, PCloudApiError.ignoreMoveSet, null);
}
throw new FatalBackendException(ex);
}
// if (source instanceof S3Folder) {
// return S3CloudNodeFactory.from(target.getParent(), client().moveFolder(source.getPath(), target.getPath()).execute());
// } else {
// return S3CloudNodeFactory.from(target.getParent(), client().moveFile(source.getPath(), target.getPath()).execute());
// }
return null;
}
public S3File write(S3File file, DataSource data, final ProgressAware<UploadState> progressAware, boolean replace, long size) throws IOException, BackendException {
@ -307,32 +297,34 @@ class S3Impl {
return true;
}
private void handleApiError(ApiError ex) throws BackendException {
handleApiError(ex, null, null);
}
//TODO: add proper error handling or remove entirely
private void handleApiError(ApiError ex, String name) throws BackendException {
handleApiError(ex, null, name);
}
private void handleApiError(ApiError ex, Set<Integer> errorCodes, String name) throws BackendException {
if (errorCodes == null || !errorCodes.contains(ex.errorCode())) {
int errorCode = ex.errorCode();
if (PCloudApiError.isCloudNodeAlreadyExistsException(errorCode)) {
throw new CloudNodeAlreadyExistsException(name);
} else if (PCloudApiError.isForbiddenException(errorCode)) {
throw new ForbiddenException();
} else if (PCloudApiError.isNetworkConnectionException(errorCode)) {
throw new NetworkConnectionException(ex);
} else if (PCloudApiError.isNoSuchCloudFileException(errorCode)) {
throw new NoSuchCloudFileException(name);
} else if (PCloudApiError.isWrongCredentialsException(errorCode)) {
throw new WrongCredentialsException(cloud);
} else if (PCloudApiError.isUnauthorizedException(errorCode)) {
throw new UnauthorizedException();
} else {
throw new FatalBackendException(ex);
}
}
}
// private void handleApiError(ApiError ex) throws BackendException {
// handleApiError(ex, null, null);
// }
//
// private void handleApiError(ApiError ex, String name) throws BackendException {
// handleApiError(ex, null, name);
// }
//
// private void handleApiError(ApiError ex, Set<Integer> errorCodes, String name) throws BackendException {
// if (errorCodes == null || !errorCodes.contains(ex.errorCode())) {
// int errorCode = ex.errorCode();
// if (PCloudApiError.isCloudNodeAlreadyExistsException(errorCode)) {
// throw new CloudNodeAlreadyExistsException(name);
// } else if (PCloudApiError.isForbiddenException(errorCode)) {
// throw new ForbiddenException();
// } else if (PCloudApiError.isNetworkConnectionException(errorCode)) {
// throw new NetworkConnectionException(ex);
// } else if (PCloudApiError.isNoSuchCloudFileException(errorCode)) {
// throw new NoSuchCloudFileException(name);
// } else if (PCloudApiError.isWrongCredentialsException(errorCode)) {
// throw new WrongCredentialsException(cloud);
// } else if (PCloudApiError.isUnauthorizedException(errorCode)) {
// throw new UnauthorizedException();
// } else {
// throw new FatalBackendException(ex);
// }
// }
// }
}