@@ -259,6 +259,7 @@ private void handleBottomNavigationViewClicks() {
259259 menuItemId = menuItem .getItemId ();
260260
261261 exitSelectionMode ();
262+ resetOnlyPersonalAndOnDevice ();
262263
263264 if (menuItemId == R .id .nav_all_files ) {
264265 showFiles (false ,false );
@@ -563,13 +564,13 @@ private void onNavigationItemClicked(final MenuItem menuItem) {
563564 setNavigationViewItemChecked ();
564565
565566 if (itemId == R .id .nav_all_files || itemId == R .id .nav_personal_files ) {
566- if (this instanceof FileDisplayActivity &&
567- !((( FileDisplayActivity ) this ) .getLeftFragment () instanceof GalleryFragment ) &&
568- !((( FileDisplayActivity ) this ) .getLeftFragment () instanceof SharedListFragment ) &&
569- !((( FileDisplayActivity ) this ) .getLeftFragment () instanceof GroupfolderListFragment ) &&
570- !((( FileDisplayActivity ) this ) .getLeftFragment () instanceof PreviewTextStringFragment )) {
567+ if (this instanceof FileDisplayActivity fda &&
568+ !(fda .getLeftFragment () instanceof GalleryFragment ) &&
569+ !(fda .getLeftFragment () instanceof SharedListFragment ) &&
570+ !(fda .getLeftFragment () instanceof GroupfolderListFragment ) &&
571+ !(fda .getLeftFragment () instanceof PreviewTextStringFragment )) {
571572 showFiles (false , itemId == R .id .nav_personal_files );
572- (( FileDisplayActivity ) this ) .browseToRoot ();
573+ fda .browseToRoot ();
573574 EventBus .getDefault ().post (new ChangeMenuEvent ());
574575 } else {
575576 MainApp .showOnlyFilesOnDevice (false );
@@ -587,25 +588,33 @@ private void onNavigationItemClicked(final MenuItem menuItem) {
587588
588589 closeDrawer ();
589590 } else if (itemId == R .id .nav_favorites ) {
591+ resetOnlyPersonalAndOnDevice ();
590592 setupToolbar ();
591593 handleSearchEvents (new SearchEvent ("" , SearchRemoteOperation .SearchType .FAVORITE_SEARCH ), menuItem .getItemId ());
592594 } else if (itemId == R .id .nav_gallery ) {
595+ resetOnlyPersonalAndOnDevice ();
593596 setupToolbar ();
594597 startPhotoSearch (menuItem .getItemId ());
595598 } else if (itemId == R .id .nav_on_device ) {
596599 EventBus .getDefault ().post (new ChangeMenuEvent ());
597600 showFiles (true , false );
598601 } else if (itemId == R .id .nav_uploads ) {
602+ resetOnlyPersonalAndOnDevice ();
599603 startActivity (UploadListActivity .class , Intent .FLAG_ACTIVITY_CLEAR_TOP );
600604 } else if (itemId == R .id .nav_trashbin ) {
605+ resetOnlyPersonalAndOnDevice ();
601606 startActivity (TrashbinActivity .class , Intent .FLAG_ACTIVITY_CLEAR_TOP );
602607 } else if (itemId == R .id .nav_activity ) {
608+ resetOnlyPersonalAndOnDevice ();
603609 startActivity (ActivitiesActivity .class , Intent .FLAG_ACTIVITY_CLEAR_TOP );
604610 } else if (itemId == R .id .nav_settings ) {
611+ resetOnlyPersonalAndOnDevice ();
605612 startActivity (SettingsActivity .class );
606613 } else if (itemId == R .id .nav_community ) {
614+ resetOnlyPersonalAndOnDevice ();
607615 startActivity (CommunityActivity .class );
608616 } else if (itemId == R .id .nav_logout ) {
617+ resetOnlyPersonalAndOnDevice ();
609618 menuItemId = Menu .NONE ;
610619 MenuItem isNewMenuItemChecked = menuItem .setChecked (false );
611620 Log_OC .d (TAG ,"onNavigationItemClicked nav_logout setChecked " + isNewMenuItemChecked );
@@ -614,13 +623,16 @@ private void onNavigationItemClicked(final MenuItem menuItem) {
614623 UserInfoActivity .openAccountRemovalDialog (optionalUser .get (), getSupportFragmentManager ());
615624 }
616625 } else if (itemId == R .id .nav_shared ) {
626+ resetOnlyPersonalAndOnDevice ();
617627 startSharedSearch (menuItem );
618628 } else if (itemId == R .id .nav_recently_modified ) {
629+ resetOnlyPersonalAndOnDevice ();
619630 startRecentlyModifiedSearch (menuItem );
620631 } else if (itemId == R .id .nav_assistant ) {
632+ resetOnlyPersonalAndOnDevice ();
621633 startComposeActivity (ComposeDestination .AssistantScreen , R .string .assistant_screen_top_bar_title );
622634 } else if (itemId == R .id .nav_groupfolders ) {
623- MainApp . showOnlyFilesOnDevice ( false );
635+ resetOnlyPersonalAndOnDevice ( );
624636 Intent intent = new Intent (getApplicationContext (), FileDisplayActivity .class );
625637 intent .addFlags (Intent .FLAG_ACTIVITY_CLEAR_TOP );
626638 intent .setAction (FileDisplayActivity .LIST_GROUPFOLDERS );
@@ -1224,6 +1236,11 @@ private void restart() {
12241236 fetchExternalLinks (false );
12251237 }
12261238
1239+ private void resetOnlyPersonalAndOnDevice () {
1240+ MainApp .showOnlyFilesOnDevice (false );
1241+ MainApp .showOnlyPersonalFiles (false );
1242+ }
1243+
12271244 /**
12281245 * show the file list to the user.
12291246 *
0 commit comments