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

Conflicts:

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

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index b99a9bf..d87aabd 100644 (file)
--- 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);
         } 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);
         }
     }
             startActivity(intent);
         }
     }