X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/a66be3bc47376f9cedcd594bf5a39dafcf1650c2..df4b83cb75915caaf7ad49848ebb6d340045478b:/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java index 5656d3fc..10a8671e 100644 --- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java +++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java @@ -46,7 +46,7 @@ import eu.alefzero.owncloud.R; import eu.alefzero.owncloud.authenticator.AccountAuthenticator; import eu.alefzero.owncloud.authenticator.AuthUtils; import eu.alefzero.owncloud.datamodel.OCFile; -import eu.alefzero.owncloud.ui.fragment.FileList; +import eu.alefzero.owncloud.ui.fragment.FileListFragment; import eu.alefzero.webdav.WebdavClient; /** @@ -138,7 +138,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements break; } case android.R.id.home: { - navigateUp(); + onBackPressed(); break; } @@ -146,15 +146,15 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements return true; } - public void navigateUp(){ + @Override + public void onBackPressed(){ popPath(); if(mDirectories.getCount() == 0) { Intent intent = new Intent(this, LandingActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); startActivity(intent); return; } - ((FileList) getSupportFragmentManager().findFragmentById(R.id.fileList)) + ((FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList)) .onNavigateUp(); } @@ -208,7 +208,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements public boolean onNavigationItemSelected(int itemPosition, long itemId) { int i = itemPosition; while (i-- != 0) { - navigateUp(); + onBackPressed(); } return true; }