Fixed null pointer while resuming FileListActivity

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b11281e..52f8e67 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r
-    android:versionName="0.1.127B" xmlns:android="http://schemas.android.com/apk/res/android">\r
+    android:versionName="0.1.128B" 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

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index dbba188..a5971f9 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -301,7 +301,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