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

feat(S3): use SUFFIX, remove unthrowable exceptions

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

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

@ -85,11 +85,11 @@ class S3Impl {
return root; return root;
} }
public S3Folder resolve(String path) throws IOException, BackendException { public S3Folder resolve(String path) {
if (path.startsWith("/")) { if (path.startsWith(SUFFIX)) {
path = path.substring(1); path = path.substring(1);
} }
String[] names = path.split("/"); String[] names = path.split(SUFFIX);
S3Folder folder = root; S3Folder folder = root;
for (String name : names) { for (String name : names) {
folder = folder(folder, name); folder = folder(folder, name);
@ -105,7 +105,7 @@ class S3Impl {
return S3CloudNodeFactory.file(parent, name, size, parent.getPath() + SUFFIX + name); return S3CloudNodeFactory.file(parent, name, size, parent.getPath() + SUFFIX + name);
} }
public S3Folder folder(S3Folder parent, String name) throws IOException, BackendException { public S3Folder folder(S3Folder parent, String name) {
return S3CloudNodeFactory.folder(parent, name, parent.getPath() + SUFFIX + name + SUFFIX); return S3CloudNodeFactory.folder(parent, name, parent.getPath() + SUFFIX + name + SUFFIX);
} }
@ -192,7 +192,7 @@ class S3Impl {
} }
private PutObjectResult uploadFile(final S3File file, DataSource data, final ProgressAware<UploadState> progressAware, final long size) // private PutObjectResult uploadFile(final S3File file, DataSource data, final ProgressAware<UploadState> progressAware, final long size) //
throws IOException, BackendException { throws IOException {
ProgressListener listener = progressEvent -> progressAware.onProgress( // ProgressListener listener = progressEvent -> progressAware.onProgress( //
progress(UploadState.upload(file)) // progress(UploadState.upload(file)) //
.between(0) // .between(0) //