From 2da9d352694b6c044eefc1188030988c0ec763b8 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 30 Nov 2022 08:37:34 +0100
Subject: [PATCH 1/2] Remove "on device"

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../com/owncloud/android/ui/activity/DrawerActivity.java     | 3 ---
 .../owncloud/android/ui/activity/FileDisplayActivity.java    | 5 -----
 app/src/main/res/menu/partial_drawer_entries.xml             | 5 -----
 3 files changed, 13 deletions(-)

diff --git a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
index 30b88ba07347..7bb3607de23c 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
@@ -439,9 +439,6 @@ private void onNavigationItemClicked(final MenuItem menuItem) {
                                menuItem.getItemId());
         } else if (itemId == R.id.nav_gallery) {
             startPhotoSearch(menuItem);
-        } else if (itemId == R.id.nav_on_device) {
-            EventBus.getDefault().post(new ChangeMenuEvent());
-            showFiles(true);
         } else if (itemId == R.id.nav_uploads) {
             startActivity(UploadListActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP);
         } else if (itemId == R.id.nav_trashbin) {
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
index baaf7f085d35..1d9971553b61 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -1197,13 +1197,8 @@ protected void onResume() {
     }
 
     private void setDrawerAllFiles() {
-        if (MainApp.isOnlyOnDevice()) {
-            setDrawerMenuItemChecked(R.id.nav_on_device);
-            setupToolbar();
-        } else {
             setDrawerMenuItemChecked(R.id.nav_all_files);
             setupHomeSearchToolbarWithSortAndListButtons();
-        }
     }
 
     public void initSyncBroadcastReceiver() {
diff --git a/app/src/main/res/menu/partial_drawer_entries.xml b/app/src/main/res/menu/partial_drawer_entries.xml
index 7a7f88671f2a..ac6bd70780e8 100644
--- a/app/src/main/res/menu/partial_drawer_entries.xml
+++ b/app/src/main/res/menu/partial_drawer_entries.xml
@@ -48,11 +48,6 @@
             android:orderInCategory="0"
             android:icon="@drawable/nav_shared"
             android:title="@string/drawer_item_shared" />
-        <item
-            android:id="@+id/nav_on_device"
-            android:icon="@drawable/nav_on_device"
-            android:orderInCategory="0"
-            android:title="@string/drawer_item_on_device"/>
         <item
             android:id="@+id/nav_recently_modified"
             android:icon="@drawable/nav_recently"

From 862940db6b1d802263f9d453357c7863e23507f7 Mon Sep 17 00:00:00 2001
From: Tobias Kaminsky <tobias@nextcloud.com>
Date: Tue, 6 Jun 2023 07:54:34 +0200
Subject: [PATCH 2/2] Update partial_drawer_entries.xml

Signed-off-by: Tobias Kaminsky <tobias@nextcloud.com>
---
 app/src/main/res/menu/partial_drawer_entries.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/res/menu/partial_drawer_entries.xml b/app/src/main/res/menu/partial_drawer_entries.xml
index ac6bd70780e8..bfb9b64ee675 100644
--- a/app/src/main/res/menu/partial_drawer_entries.xml
+++ b/app/src/main/res/menu/partial_drawer_entries.xml
@@ -43,6 +43,11 @@
             android:id="@+id/nav_gallery"
             android:icon="@drawable/nav_photos"
             android:title="@string/drawer_item_gallery" />
+         <item
+            android:id="@+id/nav_groupfolders"
+            android:orderInCategory="0"
+            android:icon="@drawable/ic_group"
+            android:title="@string/drawer_item_groupfolders" />
         <item
             android:id="@+id/nav_shared"
             android:orderInCategory="0"