From b2264dcfa1ac8d5095aa66e2980fa1d32c7650da Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Fri, 22 Jun 2012 12:46:46 +0200
Subject: [PATCH] Fixed null pointer while resuming FileListActivity

---
 AndroidManifest.xml                                           | 2 +-
 src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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