浏览代码

Merge pull request #5172 from nextcloud/preventNPE

prevent NPE
Tobias Kaminsky 5 年之前
父节点
当前提交
a8f41615d6
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5 2
      src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

+ 5 - 2
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -792,8 +792,11 @@ public class OCFileListFragment extends ExtendedListFragment implements
         }
 
         // create rich workspace
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            menu.findItem(R.id.action_create_rich_workspace).setVisible(TextUtils.isEmpty(mFile.getRichWorkspace()));
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
+            && menu.findItem(R.id.action_create_rich_workspace) != null
+            && mFile != null) {
+            menu.findItem(R.id.action_create_rich_workspace).setVisible(
+                TextUtils.isEmpty(mFile.getRichWorkspace()));
         }
     }