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

fix(pCloud): issue #305 NullReference

Browse Source 
Fix #305: NullReference when calling loadFolder with empty string
This commit is contained in:
Manuel Jenny 2021-04-23 16:34:11 +02:00
parent be12aa6122
commit c9489a3795
No known key found for this signature in database
GPG Key ID: 1C80FE62B2BEAA18
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,7 +109,9 @@ class PCloudImpl {
public boolean exists(PCloudNode node) throws IOException, BackendException { public boolean exists(PCloudNode node) throws IOException, BackendException {
try { try {
if (node instanceof PCloudFolder) { if (node instanceof RootPCloudFolder) {
client().loadFolder("/").execute();
} else if (node instanceof PCloudFolder) {
client().loadFolder(node.getPath()).execute(); client().loadFolder(node.getPath()).execute();
} else { } else {
client().loadFile(node.getPath()).execute(); client().loadFile(node.getPath()).execute();
@ -124,8 +126,13 @@ class PCloudImpl {
public List<PCloudNode> list(PCloudFolder folder) throws IOException, BackendException { public List<PCloudNode> list(PCloudFolder folder) throws IOException, BackendException {
List<PCloudNode> result = new ArrayList<>(); List<PCloudNode> result = new ArrayList<>();
String path = folder.getPath();
if (folder instanceof RootPCloudFolder) {
path = "/";
}
try { try {
RemoteFolder listFolderResult = client().listFolder(folder.getPath()).execute(); RemoteFolder listFolderResult = client().listFolder(path).execute();
List<RemoteEntry> entryMetadata = listFolderResult.children(); List<RemoteEntry> entryMetadata = listFolderResult.children();
for (RemoteEntry metadata : entryMetadata) { for (RemoteEntry metadata : entryMetadata) {
result.add(PCloudNodeFactory.from(folder, metadata)); result.add(PCloudNodeFactory.from(folder, metadata));