瀏覽代碼

Merge pull request #13416 from nextcloud/bugfix/npe-common-adapter

BugFix - NPE CommonAdapter
Alper Öztürk 8 月之前
父節點
當前提交
4ebe3be692
共有 1 個文件被更改,包括 4 次插入5 次删除
  1. 4 5
      app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

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

@@ -660,7 +660,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
 
 
     @Override
     @Override
     public void onHeaderClicked() {
     public void onHeaderClicked() {
-        if (!getAdapter().isMultiSelect() && mContainerActivity instanceof FileDisplayActivity) {
+        if (getAdapter() != null && !getAdapter().isMultiSelect() && mContainerActivity instanceof FileDisplayActivity) {
             ((FileDisplayActivity) mContainerActivity).startRichWorkspacePreview(getCurrentFile());
             ((FileDisplayActivity) mContainerActivity).startRichWorkspacePreview(getCurrentFile());
         }
         }
     }
     }
@@ -1088,7 +1088,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
             fileActivity.checkInternetConnection();
             fileActivity.checkInternetConnection();
         }
         }
 
 
-        if (getCommonAdapter().isMultiSelect()) {
+        if (getCommonAdapter() != null && getCommonAdapter().isMultiSelect()) {
             toggleItemToCheckedList(file);
             toggleItemToCheckedList(file);
         } else {
         } else {
             if (file == null) {
             if (file == null) {
@@ -1096,9 +1096,8 @@ public class OCFileListFragment extends ExtendedListFragment implements
                 return;
                 return;
             }
             }
 
 
-            int position = getCommonAdapter().getItemPosition(file);
-
-            if (file.isFolder()) {
+            if (getCommonAdapter() != null && file.isFolder()) {
+                int position = getCommonAdapter().getItemPosition(file);
                 folderOnItemClick(file, position);
                 folderOnItemClick(file, position);
             } else if (mFileSelectable) {
             } else if (mFileSelectable) {
                 Intent intent = new Intent();
                 Intent intent = new Intent();