소스 검색

Retrieve parent folder before removing document

Otherwise trying to get the parent folder will cause a NPE

Fixes #5015

Signed-off-by: Torsten Grote <t@grobox.de>
Torsten Grote 5 년 전
부모
커밋
d82de88701
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java

+ 2 - 2
src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java

@@ -573,6 +573,8 @@ public class DocumentsStorageProvider extends DocumentsProvider {
         }
 
         Document document = toDocument(documentId);
+        // get parent here, because it is not available anymore after the document was deleted
+        Document parentFolder = document.getParent();
 
         recursiveRevokePermission(document);
 
@@ -583,8 +585,6 @@ public class DocumentsStorageProvider extends DocumentsProvider {
         if (!result.isSuccess()) {
             throw new FileNotFoundException("Failed to delete document with documentId " + documentId);
         }
-
-        Document parentFolder = document.getParent();
         context.getContentResolver().notifyChange(toNotifyUri(parentFolder), null, false);
     }