From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 3 May 2013 09:26:13 +0000 (+0200)
Subject: Fixed bug when turning tablet with no file in the right fragment
X-Git-Tag: oc-android-1.4.3~27^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2a95f59adc2bdd8f8a90cab8fd8d28f90bf9fc68?ds=sidebyside;hp=-c

Fixed bug when turning tablet with no file in the right fragment

Conflicts:

	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
---

2a95f59adc2bdd8f8a90cab8fd8d28f90bf9fc68
diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index b99a9bfb..d87aabd4 100644
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -340,9 +340,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         } else {
             finish();
             Intent intent = new Intent(this, FileDisplayActivity.class);
-            intent .putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir);
-            intent .putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
-            if (fragment != null && fragment.getFile() != null )
+            intent.putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir);
+            intent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
             startActivity(intent);
         }
     }