From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Thu, 21 Jun 2012 18:27:22 +0000 (+0200)
Subject: return to correct directory when returning from file details activity
X-Git-Tag: oc-android-1.4.3~350
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e9e2e1c7ec43b254e411b46154317dd40a589ffd

return to correct directory when returning from file details activity
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 13e401db..245c1878 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->
 <manifest package="eu.alefzero.owncloud"
     android:versionCode="1"
-    android:versionName="0.1.124B" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionName="0.1.125B" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index 9430692e..65fc6b54 100644
--- 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
 
     @Override
     protected void onRestoreInstanceState(Bundle savedInstanceState) {
+        Log.e("ASD", "restore");
         super.onRestoreInstanceState(savedInstanceState);
         mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY);
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);
@@ -258,11 +259,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         if (mDirs != null)
             for (String s : mDirs)
                 mDirectories.insert(s, 0);
-        mCurrentDir = savedInstanceState.getParcelable(KEY_CURRENT_DIR);
+        mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE);
     }
     
     @Override
     protected void onSaveInstanceState(Bundle outState) {
+        Log.e("ASD", "save " + mCurrentDir.getFileName());
         super.onSaveInstanceState(outState);
         if(mDirectories != null && mDirectories.getCount() != 0){
             mDirs = new String[mDirectories.getCount()-1];
@@ -271,13 +273,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             }
         }
         outState.putStringArray(KEY_DIR_ARRAY, mDirs);
-        outState.putParcelable(KEY_CURRENT_DIR, mCurrentDir);
+        outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        
+
         if (accountsAreSetup()) {
 
             setContentView(mLayoutView);    // this should solve the crash by repeated inflating in big screens (DROIDCLOUD-27)
@@ -294,7 +296,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         
             // File list
             mFileList = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);
-        
+            
             // Figure out what directory to list. 
             // Priority: Intent (here), savedInstanceState (onCreate), root dir (dir is null)
             if(getIntent().hasExtra(FileDetailFragment.EXTRA_FILE)){
@@ -359,6 +361,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             unregisterReceiver(syncBroadcastRevceiver);
             syncBroadcastRevceiver = null;
         }
+        getIntent().putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir);
     }
 
     @Override