return to correct directory when returning from file details activity

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 13e401d..245c187 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r

-    android:versionName="0.1.124B" xmlns:android="http://schemas.android.com/apk/res/android">\r
+    android:versionName="0.1.125B" xmlns:android="http://schemas.android.com/apk/res/android">\r

 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r
 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index 9430692..65fc6b5 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -251,6 +251,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
     @Override\r
     protected void onRestoreInstanceState(Bundle savedInstanceState) {\r
 \r
     @Override\r
     protected void onRestoreInstanceState(Bundle savedInstanceState) {\r

+        Log.e("ASD", "restore");\r

         super.onRestoreInstanceState(savedInstanceState);\r
         mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY);\r
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
         super.onRestoreInstanceState(savedInstanceState);\r
         mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY);\r
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r


@@ -258,11 +259,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         if (mDirs != null)\r
             for (String s : mDirs)\r
                 mDirectories.insert(s, 0);\r
         if (mDirs != null)\r
             for (String s : mDirs)\r
                 mDirectories.insert(s, 0);\r

-        mCurrentDir = savedInstanceState.getParcelable(KEY_CURRENT_DIR);\r
+        mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE);\r

     }\r
     \r
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r
     }\r
     \r
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r

+        Log.e("ASD", "save " + mCurrentDir.getFileName());\r

         super.onSaveInstanceState(outState);\r
         if(mDirectories != null && mDirectories.getCount() != 0){\r
             mDirs = new String[mDirectories.getCount()-1];\r
         super.onSaveInstanceState(outState);\r
         if(mDirectories != null && mDirectories.getCount() != 0){\r
             mDirs = new String[mDirectories.getCount()-1];\r


@@ -271,13 +273,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             }\r
         }\r
         outState.putStringArray(KEY_DIR_ARRAY, mDirs);\r
             }\r
         }\r
         outState.putStringArray(KEY_DIR_ARRAY, mDirs);\r

-        outState.putParcelable(KEY_CURRENT_DIR, mCurrentDir);\r
+        outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r

     }\r
 \r
     @Override\r
     protected void onResume() {\r
         super.onResume();\r
     }\r
 \r
     @Override\r
     protected void onResume() {\r
         super.onResume();\r

-        \r
+\r

         if (accountsAreSetup()) {\r
 \r
             setContentView(mLayoutView);    // this should solve the crash by repeated inflating in big screens (DROIDCLOUD-27)\r
         if (accountsAreSetup()) {\r
 \r
             setContentView(mLayoutView);    // this should solve the crash by repeated inflating in big screens (DROIDCLOUD-27)\r


@@ -294,7 +296,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         \r
             // File list\r
             mFileList = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
         \r
             // File list\r
             mFileList = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r

-        \r
+            \r

             // Figure out what directory to list. \r
             // Priority: Intent (here), savedInstanceState (onCreate), root dir (dir is null)\r
             if(getIntent().hasExtra(FileDetailFragment.EXTRA_FILE)){\r
             // Figure out what directory to list. \r
             // Priority: Intent (here), savedInstanceState (onCreate), root dir (dir is null)\r
             if(getIntent().hasExtra(FileDetailFragment.EXTRA_FILE)){\r


@@ -359,6 +361,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             unregisterReceiver(syncBroadcastRevceiver);\r
             syncBroadcastRevceiver = null;\r
         }\r
             unregisterReceiver(syncBroadcastRevceiver);\r
             syncBroadcastRevceiver = null;\r
         }\r

+        getIntent().putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r

     }\r
 \r
     @Override\r
     }\r
 \r
     @Override\r