return to correct directory when returning from file details activity

[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 fae2b0f..65fc6b5 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -37,6 +37,9 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;\r
 import android.content.Intent;\r
 import android.content.IntentFilter;\r
+import android.content.pm.PackageInfo;\r
+import android.content.pm.PackageManager;\r
+import android.content.pm.PackageManager.NameNotFoundException;\r
 import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
@@ -95,6 +98,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     \r
     private static final int DIALOG_SETUP_ACCOUNT = 0;\r
     private static final int DIALOG_CREATE_DIR = 1;\r
+    private static final int DIALOG_ABOUT_APP = 2;\r
     private static final int ACTION_SELECT_FILE = 1;\r
 \r
     @Override\r
@@ -161,6 +165,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             case R.id.action_settings: {\r
                 Intent settingsIntent = new Intent(this, Preferences.class);\r
                 startActivity(settingsIntent);\r
+                break;\r
+            }\r
+            case R.id.about_app : {\r
+                showDialog(DIALOG_ABOUT_APP);\r
+                break;\r
             }\r
             case android.R.id.home: {\r
                 if(mCurrentDir != null && mCurrentDir.getParentId() != 0){\r
@@ -242,6 +251,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \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
@@ -249,11 +259,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         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
+        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
@@ -262,13 +273,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             }\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
         if (accountsAreSetup()) {\r
 \r
             setContentView(mLayoutView);    // this should solve the crash by repeated inflating in big screens (DROIDCLOUD-27)\r
@@ -285,7 +296,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         \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
@@ -350,11 +361,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             unregisterReceiver(syncBroadcastRevceiver);\r
             syncBroadcastRevceiver = null;\r
         }\r
+        getIntent().putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
     }\r
 \r
     @Override\r
     protected Dialog onCreateDialog(int id) {\r
-        Dialog dialog;\r
+        Dialog dialog = null;\r
         AlertDialog.Builder builder;\r
         switch (id) {\r
         case DIALOG_SETUP_ACCOUNT:\r
@@ -366,6 +378,22 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             builder.setNegativeButton(android.R.string.cancel, this);\r
             dialog = builder.create();\r
             break;\r
+        case DIALOG_ABOUT_APP: {\r
+            builder = new AlertDialog.Builder(this);\r
+            builder.setTitle("About");\r
+            PackageInfo pkg;\r
+            try {\r
+                pkg = getPackageManager().getPackageInfo(getPackageName(), 0);\r
+                builder.setMessage("ownCloud android client\n\nversion: " + pkg.versionName );\r
+                builder.setIcon(android.R.drawable.ic_menu_info_details);\r
+                dialog = builder.create();\r
+            } catch (NameNotFoundException e) {\r
+                builder = null;\r
+                dialog = null;\r
+                e.printStackTrace();\r
+            }\r
+            break;\r
+        }\r
         case DIALOG_CREATE_DIR: {\r
             builder = new Builder(this);\r
             final EditText dirNameInput = new EditText(getBaseContext());\r