|
@@ -67,18 +67,17 @@ public final class DrawerMenuUtil {
|
|
}
|
|
}
|
|
|
|
|
|
public static void filterTrashbinMenuItem(Menu menu, @Nullable Account account, @Nullable OCCapability capability) {
|
|
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) {
|
|
public static void filterActivityMenuItem(Menu menu, @Nullable OCCapability capability) {
|
|
if (capability != null && capability.isActivityEnabled().isFalse()) {
|
|
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) {
|
|
public static void removeMenuItem(Menu menu, int id, boolean remove) {
|