mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 07:05:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

Allow to set Menu.NONE

Browse source 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
alperozturk 2024-09-04 12:07:09 +02:00 committed by Alper Öztürk
parent 5cb2e3a410
commit 06ad7d0239
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
View file

@ -871,7 +871,7 @@ public abstract class DrawerActivity extends ToolbarActivity
* *
*/ */
public void setDrawerMenuItemChecked() { public void setDrawerMenuItemChecked() {
if (menuItemId == Menu.NONE || mNavigationView == null) { if (mNavigationView == null) {
return; return;
} }

16
app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file

@ -1158,22 +1158,20 @@ public class FileDisplayActivity extends FileActivity
Log_OC.v(TAG, "onResume() end"); Log_OC.v(TAG, "onResume() end");
} }
private void setDrawerAllFiles() { private void setDrawerAllFiles() {
if (MainApp.isOnlyPersonFiles()) { if (MainApp.isOnlyPersonFiles()) {
menuItemId = R.id.nav_personal_files; menuItemId = R.id.nav_personal_files;
setDrawerMenuItemChecked();
setupHomeSearchToolbarWithSortAndListButtons();
} else if (MainApp.isOnlyOnDevice()) { } else if (MainApp.isOnlyOnDevice()) {
menuItemId = R.id.nav_on_device; menuItemId = R.id.nav_on_device;
setDrawerMenuItemChecked(); } else if (menuItemId == Menu.NONE) {
menuItemId = R.id.nav_all_files;
}
setDrawerMenuItemChecked();
if (MainApp.isOnlyOnDevice()) {
setupToolbar(); setupToolbar();
} else { } else {
if (menuItemId == Menu.NONE) {
menuItemId = R.id.nav_all_files;
}
setDrawerMenuItemChecked();
setupHomeSearchToolbarWithSortAndListButtons(); setupHomeSearchToolbarWithSortAndListButtons();
} }
} }