X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/1b47b282f287527062f33704cc8a85ca53b1fef1..231533c56e8873c6c77f6ff9f649c7b587ab5cce:/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 fae2b0fd..c2a80900 100644
--- 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;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
@@ -95,14 +98,19 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     
     private static final int DIALOG_SETUP_ACCOUNT = 0;
     private static final int DIALOG_CREATE_DIR = 1;
+    private static final int DIALOG_ABOUT_APP = 2;
     private static final int ACTION_SELECT_FILE = 1;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-        setProgressBarIndeterminateVisibility(false);
+        // TODO: fix hack: workaround for bug in actionbar sherlock
+        // it always shows indeterminate progress bar
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {
+            requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
+            setProgressBarIndeterminateVisibility(false);
+        }
 
         Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));
 
@@ -161,6 +169,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             case R.id.action_settings: {
                 Intent settingsIntent = new Intent(this, Preferences.class);
                 startActivity(settingsIntent);
+                break;
+            }
+            case R.id.about_app : {
+                showDialog(DIALOG_ABOUT_APP);
+                break;
             }
             case android.R.id.home: {
                 if(mCurrentDir != null && mCurrentDir.getParentId() != 0){
@@ -242,6 +255,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);
@@ -249,11 +263,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 != null ? mCurrentDir.getFileName() : "NULL"));
         super.onSaveInstanceState(outState);
         if(mDirectories != null && mDirectories.getCount() != 0){
             mDirs = new String[mDirectories.getCount()-1];
@@ -262,13 +277,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)
@@ -285,12 +300,12 @@ 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)){
                 mCurrentDir = (OCFile) getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE);
-                if(!mCurrentDir.isDirectory()){
+                if(mCurrentDir != null && !mCurrentDir.isDirectory()){
                     mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId());
                 }
             
@@ -350,11 +365,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             unregisterReceiver(syncBroadcastRevceiver);
             syncBroadcastRevceiver = null;
         }
+        getIntent().putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir);
     }
 
     @Override
     protected Dialog onCreateDialog(int id) {
-        Dialog dialog;
+        Dialog dialog = null;
         AlertDialog.Builder builder;
         switch (id) {
         case DIALOG_SETUP_ACCOUNT:
@@ -366,6 +382,22 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             builder.setNegativeButton(android.R.string.cancel, this);
             dialog = builder.create();
             break;
+        case DIALOG_ABOUT_APP: {
+            builder = new AlertDialog.Builder(this);
+            builder.setTitle("About");
+            PackageInfo pkg;
+            try {
+                pkg = getPackageManager().getPackageInfo(getPackageName(), 0);
+                builder.setMessage("ownCloud android client\n\nversion: " + pkg.versionName );
+                builder.setIcon(android.R.drawable.ic_menu_info_details);
+                dialog = builder.create();
+            } catch (NameNotFoundException e) {
+                builder = null;
+                dialog = null;
+                e.printStackTrace();
+            }
+            break;
+        }
         case DIALOG_CREATE_DIR: {
             builder = new Builder(this);
             final EditText dirNameInput = new EditText(getBaseContext());