Merge pull request #13415 from nextcloud/bugfix/drawer-layout-selection-when-app-in-background-and-foreground

BugFix - Preserve Selected Drawer Tab State When App Returns to Foreground

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

@@ -462,6 +462,7 @@ public abstract class DrawerActivity extends ToolbarActivity
                 return true;
             });
 
+
         User account = accountManager.getUser();
         filterDrawerMenu(navigationView.getMenu(), account);
     }
@@ -1052,6 +1053,10 @@ public abstract class DrawerActivity extends ToolbarActivity
         updateQuotaLink();
     }
 
+    public int getCheckedMenuItem() {
+        return mCheckedMenuItem;
+    }
+
     @Override
     public void onConfigurationChanged(@NonNull Configuration newConfig) {
         super.onConfigurationChanged(newConfig);

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

@@ -1168,7 +1168,12 @@ public class FileDisplayActivity extends FileActivity
             setDrawerMenuItemChecked(R.id.nav_on_device);
             setupToolbar();
         } else {
-            setDrawerMenuItemChecked(R.id.nav_all_files);
+            int lastMenuItem = getCheckedMenuItem();
+            if (lastMenuItem == Menu.NONE) {
+                lastMenuItem = R.id.nav_all_files;
+            }
+
+            setDrawerMenuItemChecked(lastMenuItem);
             setupHomeSearchToolbarWithSortAndListButtons();
         }
     }