Browse Source

Fixed null pointer while resuming FileListActivity

David A. Velasco 13 years ago
parent
commit
b2264dcfa1

+ 1 - 1
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" />

+ 1 - 1
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());
                 }