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

fix: null safe folderid for list

Browse Source
This commit is contained in:
Manuel Jenny 2021-03-16 17:39:41 +01:00
parent b08a9cb549
commit 7dc9456d97
No known key found for this signature in database
GPG Key ID: 1C80FE62B2BEAA18
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,9 +123,17 @@ class PCloudImpl {
public List<PCloudNode> list(CloudFolder folder) throws ApiError, IOException { public List<PCloudNode> list(CloudFolder folder) throws ApiError, IOException {
List<PCloudNode> result = new ArrayList<>(); List<PCloudNode> result = new ArrayList<>();
RemoteFolder listFolderResult = client() //
.listFolder(((PCloudFolder) folder).getId()) // Long folderId = ((PCloudFolder)folder).getId();
.execute(); RemoteFolder listFolderResult;
if (folderId == null) {
listFolderResult = client().listFolder(folder.getPath()).execute();
} else {
listFolderResult = client() //
.listFolder(((PCloudFolder) folder).getId()) //
.execute();
}
List<RemoteEntry> entryMetadata = listFolderResult.children(); List<RemoteEntry> entryMetadata = listFolderResult.children();
for (RemoteEntry metadata : entryMetadata) { for (RemoteEntry metadata : entryMetadata) {
result.add(PCloudCloudNodeFactory.from( // result.add(PCloudCloudNodeFactory.from( //