Pārlūkot izejas kodu

codacy: combine nested if statements

AndyScherzinger 6 gadi atpakaļ
vecāks
revīzija
4724ab3329

+ 6 - 7
src/main/java/com/owncloud/android/utils/DrawerMenuUtil.java

@@ -67,18 +67,17 @@ public final class DrawerMenuUtil {
     }
 
     public static void filterTrashbinMenuItem(Menu menu, @Nullable Account account, @Nullable OCCapability capability) {
-        if (account != null && capability != null) {
-            if (AccountUtils.getServerVersion(account).compareTo(OwnCloudVersion.nextcloud_14) < 0 ||
-                    capability.getFilesUndelete().isFalse() || capability.getFilesUndelete().isUnknown()) {
-                filterMenuItems(menu, R.id.nav_trashbin);
-            }
+        if (account != null && capability != null &&
+                (AccountUtils.getServerVersion(account).compareTo(OwnCloudVersion.nextcloud_14) < 0 ||
+                        capability.getFilesUndelete().isFalse() || capability.getFilesUndelete().isUnknown())) {
+            filterMenuItems(menu, R.id.nav_trashbin);
         }
     }
 
     public static void filterActivityMenuItem(Menu menu, @Nullable OCCapability capability) {
         if (capability != null && capability.isActivityEnabled().isFalse()) {
-                filterMenuItems(menu, R.id.nav_activity);
-            }
+            filterMenuItems(menu, R.id.nav_activity);
+        }
     }
 
     public static void removeMenuItem(Menu menu, int id, boolean remove) {