浏览代码

Merge pull request #9068 from nextcloud/fix-npe-in-file-detail-fragment

Do not mark comments as read when FileDetailActivitiesFragment is detached
Álvaro Brey 3 年之前
父节点
当前提交
f7216cfbca
共有 1 个文件被更改,包括 4 次插入6 次删除
  1. 4 6
      src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java

+ 4 - 6
src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java

@@ -237,10 +237,10 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
         binding.pager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(binding.tabLayout) {
             @Override
             public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-                if (activeTab == 0) {
-                    getFileDetailActivitiesFragment().markCommentsAsRead();
+                final FileDetailActivitiesFragment fragment = getFileDetailActivitiesFragment();
+                if (activeTab == 0 && fragment != null) {
+                    fragment.markCommentsAsRead();
                 }
-
                 super.onPageScrolled(position, positionOffset, positionOffsetPixels);
             }
         });
@@ -248,10 +248,8 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
                 binding.pager.setCurrentItem(tab.getPosition());
-
                 if (tab.getPosition() == 0) {
-                    FileDetailActivitiesFragment fragment = getFileDetailActivitiesFragment();
-
+                    final FileDetailActivitiesFragment fragment = getFileDetailActivitiesFragment();
                     if (fragment != null) {
                         fragment.markCommentsAsRead();
                     }