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

fix: exist to also check files properly

Browse Source
This commit is contained in:
Manuel Jenny 2021-03-16 16:42:49 +01:00
parent 42abae3a5a
commit ad8d5338ca
No known key found for this signature in database
GPG Key ID: 1C80FE62B2BEAA18
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudApiErrorCodes.java
View File

@ -9,7 +9,7 @@ public enum PCloudApiErrorCodes {
INVALID_DESTINATION(1037), INVALID_DESTINATION(1037),
PROVIDE_URL(1040), PROVIDE_URL(1040),
LOGIN_FAILED(2000), LOGIN_FAILED(2000),
INVALID_FILE_FOLDER_NAME(2001), INVALID_FILE_OR_FOLDER_NAME(2001),
COMPONENT_OF_PARENT_DIRECTORY_DOES_NOT_EXIST(2002), COMPONENT_OF_PARENT_DIRECTORY_DOES_NOT_EXIST(2002),
ACCESS_DENIED(2003), ACCESS_DENIED(2003),
FILE_OR_FOLDER_ALREADY_EXISTS(2004), FILE_OR_FOLDER_ALREADY_EXISTS(2004),
@ -22,6 +22,7 @@ public enum PCloudApiErrorCodes {
ACTIVE_SHARES_OR_SHAREREQUESTS_PRESENT(2028), ACTIVE_SHARES_OR_SHAREREQUESTS_PRESENT(2028),
CANNOT_RENAME_ROOT_FOLDER(2042), CANNOT_RENAME_ROOT_FOLDER(2042),
CANNOT_MOVE_FOLDER_INTO_SUBFOLDER_OF_ITSELF(2043), CANNOT_MOVE_FOLDER_INTO_SUBFOLDER_OF_ITSELF(2043),
FILE_OR_FOLDER_NOT_FOUND(2055),
INVALID_ACCESS_TOKEN(2094), INVALID_ACCESS_TOKEN(2094),
TOO_MANY_LOGIN_TRIES_FROM_IP(4000), TOO_MANY_LOGIN_TRIES_FROM_IP(4000),
INTERNAL_ERROR(5000), INTERNAL_ERROR(5000),

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

@ -43,10 +43,6 @@ import okio.Source;
import static org.cryptomator.domain.usecases.cloud.Progress.progress; import static org.cryptomator.domain.usecases.cloud.Progress.progress;
class PCloudImpl { class PCloudImpl {
private static final int DIRECTORY_DOES_NOT_EXIST = 2005;
private static final int INVALID_FILE_OR_FOLDER_NAME = 2001;
private final PCloudClientFactory clientFactory = new PCloudClientFactory(); private final PCloudClientFactory clientFactory = new PCloudClientFactory();
private final PCloudCloud cloud; private final PCloudCloud cloud;
private final RootPCloudFolder root; private final RootPCloudFolder root;
@ -116,7 +112,9 @@ class PCloudImpl {
return true; return true;
} }
} catch (ApiError e) { } catch (ApiError e) {
if (e.errorCode() == DIRECTORY_DOES_NOT_EXIST || e.errorCode() == INVALID_FILE_OR_FOLDER_NAME) { if (e.errorCode() == PCloudApiErrorCodes.DIRECTORY_DOES_NOT_EXIST.getValue()
|| e.errorCode() == PCloudApiErrorCodes.INVALID_FILE_OR_FOLDER_NAME.getValue()
|| e.errorCode() == PCloudApiErrorCodes.FILE_OR_FOLDER_NOT_FOUND.getValue()) {
return false; return false;
} }
throw e; throw e;