fix search related items in drawer

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -300,7 +300,7 @@ public abstract class DrawerActivity extends ToolbarActivity
                                                                            getContentResolver());
         OCCapability capability = storageManager.getCapability(user.getAccountName());
 
-        DrawerMenuUtil.filterSearchMenuItems(menu, user, getResources(), true);
+        DrawerMenuUtil.filterSearchMenuItems(menu, user, getResources());
         DrawerMenuUtil.filterTrashbinMenuItem(menu, user, capability);
         DrawerMenuUtil.filterActivityMenuItem(menu, capability);
 

src/main/java/com/owncloud/android/utils/DrawerMenuUtil.java

@@ -31,6 +31,7 @@ import com.owncloud.android.R;
 import com.owncloud.android.lib.resources.status.OCCapability;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 /**
@@ -42,32 +43,26 @@ public final class DrawerMenuUtil {
 
     public static void filterSearchMenuItems(Menu menu,
                                              User user,
-                                             Resources resources,
-                                             boolean hasSearchSupport) {
-        if (!user.isAnonymous() && !hasSearchSupport) {
+                                             Resources resources) {
+        if (user.isAnonymous()) {
             filterMenuItems(menu, R.id.nav_photos, R.id.nav_favorites, R.id.nav_videos);
         }
 
-        if (hasSearchSupport) {
-            if (!resources.getBoolean(R.bool.recently_added_enabled)) {
-                menu.removeItem(R.id.nav_recently_added);
-            }
+        if (!resources.getBoolean(R.bool.recently_added_enabled)) {
+            menu.removeItem(R.id.nav_recently_added);
+        }
 
-            if (!resources.getBoolean(R.bool.recently_modified_enabled)) {
-                menu.removeItem(R.id.nav_recently_modified);
-            }
+        if (!resources.getBoolean(R.bool.recently_modified_enabled)) {
+            menu.removeItem(R.id.nav_recently_modified);
+        }
 
-            if (!resources.getBoolean(R.bool.videos_enabled)) {
-                menu.removeItem(R.id.nav_videos);
-            }
-        } else if (!user.isAnonymous()) {
-            filterMenuItems(menu, R.id.nav_recently_added, R.id.nav_recently_modified, R.id.nav_videos);
+        if (!resources.getBoolean(R.bool.videos_enabled)) {
+            menu.removeItem(R.id.nav_videos);
         }
     }
 
-    public static void filterTrashbinMenuItem(Menu menu, User user, @Nullable OCCapability capability) {
-        if (!user.isAnonymous() &&
-            user.getServer().getVersion().compareTo(OwnCloudVersion.nextcloud_14) < 0 ||
+    public static void filterTrashbinMenuItem(Menu menu, @NonNull User user, @Nullable OCCapability capability) {
+        if (user.getServer().getVersion().compareTo(OwnCloudVersion.nextcloud_14) < 0 ||
             capability != null && capability.getFilesUndelete().isFalse() ||
             capability != null && capability.getFilesUndelete().isUnknown()) {
             filterMenuItems(menu, R.id.nav_trashbin);

src/main/res/menu/partial_drawer_entries.xml

@@ -42,8 +42,7 @@
         <item
             android:id="@+id/nav_photos"
             android:icon="@drawable/nav_photos"
-            android:title="@string/drawer_item_photos"
-            android:visible="false"/>
+            android:title="@string/drawer_item_photos" />
         <item
             android:id="@+id/nav_videos"
             android:icon="@drawable/nav_videos"
@@ -54,8 +53,7 @@
             android:id="@+id/nav_shared"
             android:orderInCategory="0"
             android:icon="@drawable/nav_shared"
-            android:title="@string/drawer_item_shared"
-            android:visible="false"/>
+            android:title="@string/drawer_item_shared" />
         <item
             android:id="@+id/nav_on_device"
             android:icon="@drawable/nav_on_device"