From 7dc9456d972030626c9a189f8be2a9de3ec38f6d Mon Sep 17 00:00:00 2001 From: Manuel Jenny Date: Tue, 16 Mar 2021 17:39:41 +0100 Subject: [PATCH] fix: null safe folderid for list --- .../cryptomator/data/cloud/pcloud/PCloudImpl.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.java b/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.java index 480eb8e0..58f9fd17 100644 --- a/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.java +++ b/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.java @@ -123,9 +123,17 @@ class PCloudImpl { public List list(CloudFolder folder) throws ApiError, IOException { List result = new ArrayList<>(); - RemoteFolder listFolderResult = client() // - .listFolder(((PCloudFolder) folder).getId()) // - .execute(); + + Long folderId = ((PCloudFolder)folder).getId(); + RemoteFolder listFolderResult; + if (folderId == null) { + listFolderResult = client().listFolder(folder.getPath()).execute(); + } else { + listFolderResult = client() // + .listFolder(((PCloudFolder) folder).getId()) // + .execute(); + } + List entryMetadata = listFolderResult.children(); for (RemoteEntry metadata : entryMetadata) { result.add(PCloudCloudNodeFactory.from( //