Changed navigation behavior again after some feedback ;-)

[pub/Android/ownCloud.git] / 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 5656d3f..10a8671 100644 (file)
--- 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;\r
 import eu.alefzero.owncloud.authenticator.AuthUtils;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
-import eu.alefzero.owncloud.ui.fragment.FileList;\r
+import eu.alefzero.owncloud.ui.fragment.FileListFragment;\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r
 /**\r
@@ -138,7 +138,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                        break;\r
                }\r
                case android.R.id.home: {\r
-                       navigateUp();\r
+                       onBackPressed();\r
                        break;\r
                }\r
                        \r
@@ -146,15 +146,15 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                return true;\r
        }\r
        \r
-       public void navigateUp(){\r
+       @Override\r
+       public void onBackPressed(){\r
                popPath();\r
                if(mDirectories.getCount() == 0) {\r
                        Intent intent = new Intent(this, LandingActivity.class);\r
-                       intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);\r
                        startActivity(intent);\r
                        return;\r
                }\r
-               ((FileList) getSupportFragmentManager().findFragmentById(R.id.fileList))\r
+               ((FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList))\r
                                .onNavigateUp();\r
        }\r
 \r
@@ -208,7 +208,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
        public boolean onNavigationItemSelected(int itemPosition, long itemId) {\r
                int i = itemPosition;\r
                while (i-- != 0) {\r
-                       navigateUp();\r
+                       onBackPressed();\r
                }\r
                return true;\r
        }\r