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

Fix creating folders in the RootFolder of the bucked in S3

Browse Source 
Stat requests throws an IllegalStateException if key is empty string
This commit is contained in:
Julian Raufelder 2021-05-12 12:22:21 +02:00
parent 19d08fa692
commit e16ba4e5a9
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,7 +106,14 @@ class S3Impl {
public boolean exists(S3Node node) throws BackendException { public boolean exists(S3Node node) throws BackendException {
String key = node.getKey(); String key = node.getKey();
try { try {
client().statObject(StatObjectArgs.builder().bucket(cloud.s3Bucket()).object(key).build()); if(!(node instanceof RootS3Folder)) {
client().statObject(StatObjectArgs.builder().bucket(cloud.s3Bucket()).object(key).build());
return true;
} else {
// stat requests throws an IllegalStateException if key is empty string
ListObjectsArgs request = ListObjectsArgs.builder().bucket(cloud.s3Bucket()).prefix(key).delimiter(DELIMITER).build();
return client().listObjects(request).iterator().hasNext();
}
} catch (ErrorResponseException e) { } catch (ErrorResponseException e) {
if (S3CloudApiErrorCodes.NO_SUCH_KEY.getValue().equals(e.errorResponse().code())) { if (S3CloudApiErrorCodes.NO_SUCH_KEY.getValue().equals(e.errorResponse().code())) {
return false; return false;
@ -115,7 +122,8 @@ class S3Impl {
} catch (Exception ex) { } catch (Exception ex) {
handleApiError(ex, node.getPath()); handleApiError(ex, node.getPath());
} }
return true;
throw new FatalBackendException(new IllegalStateException("Exception thrown but not handled?"));
} }
public List<S3Node> list(S3Folder folder) throws IOException, BackendException { public List<S3Node> list(S3Folder folder) throws IOException, BackendException {
@ -221,7 +229,7 @@ class S3Impl {
} }
} }
throw new IllegalStateException(); throw new FatalBackendException(new IllegalStateException("Exception thrown but not handled?"));
} }
public S3File write(S3File file, DataSource data, final ProgressAware<UploadState> progressAware, boolean replace, long size) throws IOException, BackendException { public S3File write(S3File file, DataSource data, final ProgressAware<UploadState> progressAware, boolean replace, long size) throws IOException, BackendException {
@ -264,7 +272,7 @@ class S3Impl {
} }
} }
throw new IllegalStateException(); throw new FatalBackendException(new IllegalStateException("Exception thrown but not handled?"));
} }
public void read(S3File file, OutputStream data, final ProgressAware<DownloadState> progressAware) throws IOException, BackendException { public void read(S3File file, OutputStream data, final ProgressAware<DownloadState> progressAware) throws IOException, BackendException {