mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-24 14:15:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix isChildDocument()

Browse source 
Signed-off-by: Jens Mueller <tschenser@gmx.de>
This commit is contained in:
Jens Mueller 2019-07-30 21:03:27 +02:00 committed by Andy Scherzinger
parent b2eacc46b4
commit a2350598da
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java
View file

@ -616,14 +616,16 @@ public class DocumentsStorageProvider extends DocumentsProvider {
Log.d(TAG, "isChildDocument(), parent=" + parentDocumentId + ", id=" + documentId);
try {
Document document = toDocument(documentId);
Document folderDocument = toDocument(parentDocumentId);
Document currentDocument = toDocument(documentId);
Document parentDocument = toDocument(parentDocumentId);
if (null == document || null == folderDocument) {
return false;
while (!ROOT_PATH.equals(currentDocument.getRemotePath())) {
currentDocument = currentDocument.getParent();
if (parentDocument.getFile().equals(currentDocument.getFile())) {
return true;
}
}
return document.getFile().getParentId() == folderDocument.getFile().getFileId();
} catch (FileNotFoundException e) {
Log.e(TAG, "failed to check for child document", e);
}
@ -802,7 +804,12 @@ public class DocumentsStorageProvider extends DocumentsProvider {
}
Document getParent() {
return new Document(getStorageManager(), getFile().getParentId());
long parentId = getFile().getParentId();
if (parentId <= 0) {
return null;
}
return new Document(getStorageManager(), parentId);
}
}
}