include appverion in crashlog

[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 65fc6b5..c2a8090 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -105,8 +105,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     public void onCreate(Bundle savedInstanceState) {\r
         super.onCreate(savedInstanceState);\r
 \r
-        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
-        setProgressBarIndeterminateVisibility(false);\r
+        // TODO: fix hack: workaround for bug in actionbar sherlock\r
+        // it always shows indeterminate progress bar\r
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {\r
+            requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
+            setProgressBarIndeterminateVisibility(false);\r
+        }\r
 \r
         Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));\r
 \r
@@ -264,7 +268,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     \r
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r
-        Log.e("ASD", "save " + mCurrentDir.getFileName());\r
+        Log.e("ASD", "save " + (mCurrentDir != null ? mCurrentDir.getFileName() : "NULL"));\r
         super.onSaveInstanceState(outState);\r
         if(mDirectories != null && mDirectories.getCount() != 0){\r
             mDirs = new String[mDirectories.getCount()-1];\r
@@ -301,7 +305,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             // Priority: Intent (here), savedInstanceState (onCreate), root dir (dir is null)\r
             if(getIntent().hasExtra(FileDetailFragment.EXTRA_FILE)){\r
                 mCurrentDir = (OCFile) getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE);\r
-                if(!mCurrentDir.isDirectory()){\r
+                if(mCurrentDir != null && !mCurrentDir.isDirectory()){\r
                     mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId());\r
                 }\r
             \r