浏览代码

codacy: These nested if statements could be combined

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 5 年之前
父节点
当前提交
d2c9e3273f

+ 3 - 4
src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -218,11 +218,10 @@ public class ExtendedListFragment extends Fragment implements
                 handler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
-                        if (getActivity() != null && !(getActivity() instanceof FolderPickerActivity)) {
+                        if (getActivity() != null && !(getActivity() instanceof FolderPickerActivity)
+                            && !(getActivity() instanceof UploadFilesActivity)) {
+                            setFabVisible(!hasFocus);
 
-                            if (!(getActivity() instanceof UploadFilesActivity)) {
-                                setFabVisible(!hasFocus);
-                            }
                         }
                     }
                 }, 100);

+ 3 - 4
src/main/java/com/owncloud/android/ui/fragment/PhotoFragment.java

@@ -170,11 +170,10 @@ public class PhotoFragment extends OCFileListFragment {
                 int totalItemCount = gridLayoutManager.getItemCount();
                 int firstVisibleItem = gridLayoutManager.findFirstCompletelyVisibleItemPosition();
 
-                if ((totalItemCount - visibleItemCount) <= (firstVisibleItem + MAX_ITEMS_PER_ROW)) {
+                if ((totalItemCount - visibleItemCount) <= (firstVisibleItem + MAX_ITEMS_PER_ROW)
+                    && (totalItemCount - visibleItemCount) > 0) {
                     // Almost reached the end, continue to load new photos
-                    if ((totalItemCount - visibleItemCount) > 0) {
-                        searchAndDisplay();
-                    }
+                    searchAndDisplay();
                 }
             }
         }