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

OC-1507- Reopened. Browse up <

Browse source
This commit is contained in:
masensio 2013-10-01 13:43:52 +02:00
parent 5ff0989eb4
commit df394c71be
1 changed files with 14 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file

@ -594,23 +594,22 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
@Override
public void onBackPressed() {
if (!mSyncInProgress) {
OCFileListFragment listOfFiles = getListOfFilesFragment();
if (mDualPane || getSecondFragment() == null) {
if (listOfFiles != null) { // should never be null, indeed
if (mDirectories.getCount() <= 1) {
finish();
return;
}
popDirname();
listOfFiles.onBrowseUp();
}
}
OCFileListFragment listOfFiles = getListOfFilesFragment();
if (mDualPane || getSecondFragment() == null) {
if (listOfFiles != null) { // should never be null, indeed
setFile(listOfFiles.getCurrentFile());
if (mDirectories.getCount() <= 1) {
finish();
return;
}
popDirname();
listOfFiles.onBrowseUp();
}
cleanSecondFragment();
}
if (listOfFiles != null) { // should never be null, indeed
setFile(listOfFiles.getCurrentFile());
}
cleanSecondFragment();
}
@Override
@ -651,19 +650,6 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
}
@Override
protected void onStart() {
super.onStart();
Log_OC.e(TAG, "onStart() start");
// Update the sync operation
if (mSyncInProgress){
}
Log_OC.e(TAG, "onStart() end");
}
@Override
protected void onPause() {
super.onPause();
@ -1073,7 +1059,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
if (chosenFile == null || mDualPane) {
// only list of files - set for browsing through folders
OCFile currentDir = getCurrentDir();
actionBar.setDisplayHomeAsUpEnabled(currentDir != null && currentDir.getParentId() != 0 && !mSyncInProgress);
actionBar.setDisplayHomeAsUpEnabled(currentDir != null && currentDir.getParentId() != 0);
actionBar.setDisplayShowTitleEnabled(false);
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
actionBar.setListNavigationCallbacks(mDirectories, this); // assuming mDirectories is updated