瀏覽代碼

fix tests

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 4 年之前
父節點
當前提交
38c28332e2
共有 1 個文件被更改,包括 16 次插入3 次删除
  1. 16 3
      src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

+ 16 - 3
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -290,9 +290,12 @@ public class OCFileListFragment extends ExtendedListFragment implements
             setChoiceModeAsMultipleModal(savedInstanceState);
         }
 
-        mFabMain = getActivity().findViewById(R.id.fab_main);
-        ThemeUtils.tintFloatingActionButton(mFabMain, requireContext());
-        ThemeUtils.drawableFloatingActionButton(mFabMain, R.drawable.ic_plus, requireContext());
+        mFabMain = requireActivity().findViewById(R.id.fab_main);
+
+        if (mFabMain != null) { // is not available in FolderPickerActivity
+            ThemeUtils.tintFloatingActionButton(mFabMain, requireContext());
+            ThemeUtils.drawableFloatingActionButton(mFabMain, R.drawable.ic_plus, requireContext());
+        }
 
         Log_OC.i(TAG, "onCreateView() end");
         return v;
@@ -1758,6 +1761,11 @@ public class OCFileListFragment extends ExtendedListFragment implements
      * @param visible Desired visibility for the FAB.
      */
     void setFabVisible(final boolean visible) {
+        if (mFabMain == null) {
+            // is not available in FolderPickerActivity
+            return;
+        }
+
         if (getActivity() != null) {
             getActivity().runOnUiThread(() -> {
                 if (visible) {
@@ -1803,6 +1811,11 @@ public class OCFileListFragment extends ExtendedListFragment implements
      * @param enabled Desired visibility for the FAB.
      */
     public void setFabEnabled(final boolean enabled) {
+        if (mFabMain == null) {
+            // is not available in FolderPickerActivity
+            return;
+        }
+
         if (getActivity() != null) {
             getActivity().runOnUiThread(() -> {
                 if (enabled) {