浏览代码

files: avoid possible dereference of null pointer.

it seems the `capability` object can be null. In which case it is probably a bad idea to pass a null object into `getRichDocumentsDirectEditing()`.

Signed-off-by: ardevd <edvard.holst@gmail.com>
ardevd 6 年之前
父节点
当前提交
b96414d794
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      src/main/java/com/owncloud/android/files/FileMenuFilter.java

+ 3 - 1
src/main/java/com/owncloud/android/files/FileMenuFilter.java

@@ -184,7 +184,9 @@ public class FileMenuFilter {
         filterUnsetEncrypted(toShow, toHide, endToEndEncryptionEnabled);
         filterUnsetEncrypted(toShow, toHide, endToEndEncryptionEnabled);
         filterSetPictureAs(toShow, toHide);
         filterSetPictureAs(toShow, toHide);
         filterStream(toShow, toHide);
         filterStream(toShow, toHide);
-        filterOpenAsRichDocument(toShow, toHide, capability);
+        if (endToEndEncryptionEnabled) {
+            filterOpenAsRichDocument(toShow, toHide, capability);
+        }
     }
     }
 
 
     private void filterShareFile(List<Integer> toShow, List<Integer> toHide, OCCapability capability) {
     private void filterShareFile(List<Integer> toShow, List<Integer> toHide, OCCapability capability) {