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

fix: improve exception handling for read()

Browse Source
This commit is contained in:
Manuel Jenny 2021-03-21 10:47:01 +01:00
parent 2158e2a0d4
commit 81bde173f1
No known key found for this signature in database
GPG Key ID: 1C80FE62B2BEAA18
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.java
View File

@ -91,6 +91,9 @@ class PCloudImpl {
}
private Optional<RemoteEntry> findEntry(Long folderId, String name, boolean isFolder) throws IOException, BackendException {
if (folderId == null) {
throw new NoSuchCloudFileException();
}
try {
RemoteFolder remoteFolder = client().listFolder(folderId).execute();
for (RemoteEntry remoteEntry : remoteFolder.children()) {
@ -108,6 +111,8 @@ class PCloudImpl {
} catch(ApiError ex) {
Set<Integer> ignoredErrorCodes = new HashSet<>();
ignoredErrorCodes.add(PCloudApiError.PCloudApiErrorCodes.DIRECTORY_DOES_NOT_EXIST.getValue());
ignoredErrorCodes.add(PCloudApiError.PCloudApiErrorCodes.FILE_OR_FOLDER_NOT_FOUND.getValue());
ignoredErrorCodes.add(PCloudApiError.PCloudApiErrorCodes.FILE_NOT_FOUND.getValue());
handleApiError(ex, ignoredErrorCodes);
return Optional.empty();
}
@ -320,7 +325,15 @@ class PCloudImpl {
Long fileId = file.getId();
if (fileId == null) {
fileId = idCache.get(file.getPath()).getId();
PCloudIdCache.NodeInfo nodeInfo = idCache.get(file.getPath());
if (nodeInfo != null) {
fileId = nodeInfo.getId();
} else {
Optional<RemoteEntry> remoteEntryOptional = findEntry(file.getParent().getId(), file.getName(), false);
if (remoteEntryOptional.isPresent()) {
fileId = remoteEntryOptional.get().asFile().fileId();
}
}
}
try {