Skip to content

#145 Let user go back from upload activity #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
przybylski wants to merge 1 commit into from
Closed

#145 Let user go back from upload activity #146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions src/com/owncloud/android/ui/activity/DrawerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,16 +202,10 @@ public boolean onNavigationItemSelected(MenuItem menuItem) {

switch (menuItem.getItemId()) {
case R.id.nav_all_files:
menuItem.setChecked(true);
mCheckedMenuItem = menuItem.getItemId();
MainApp.showOnlyFilesOnDevice(false);
refreshDirectory();
refreshFileListOrOpenFileList(false, menuItem);
break;
case R.id.nav_on_device:
menuItem.setChecked(true);
mCheckedMenuItem = menuItem.getItemId();
MainApp.showOnlyFilesOnDevice(true);
refreshDirectory();
refreshFileListOrOpenFileList(true, menuItem);
break;
case R.id.nav_uploads:
Intent uploadListIntent = new Intent(getApplicationContext(),
Expand Down Expand Up @@ -251,6 +245,19 @@ public boolean onNavigationItemSelected(MenuItem menuItem) {
}
}

private void refreshFileListOrOpenFileList(boolean onDeviceOnly, MenuItem clickedItem) {
clickedItem.setChecked(true);
mCheckedMenuItem = clickedItem.getItemId();
MainApp.showOnlyFilesOnDevice(onDeviceOnly);
if (DrawerActivity.this instanceof FileDisplayActivity) {
refreshDirectory();
} else {
Intent i = new Intent(getApplicationContext(), FileDisplayActivity.class);
i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(i);
}
}

/**
* sets the new/current account and restarts. In case the given account equals the actual/current account the
* call will be ignored.
Expand Down