From: masensio <masensio@solidgear.es>
Date: Tue, 27 May 2014 11:20:01 +0000 (+0200)
Subject: Merge branch 'fixed_video_playback_on_rotations' into release-1.5.6
X-Git-Tag: oc-android-1.7.0_signed~295^2~8
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e9f0604fb744848b3243596446e5d23e58269089?hp=a3a5cd4eb7e020d7a197dc266cc9d18f738266ad

Merge branch 'fixed_video_playback_on_rotations' into release-1.5.6
---

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 04d28134..4babd9db 100644
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -181,11 +181,6 @@ FileFragment.ContainerActivity, OnNavigationListener, OnSslUntrustedCertListener
         mRightFragmentContainer = findViewById(R.id.right_fragment_container);
         if (savedInstanceState == null) {
             createMinFragments();
-        } else {
-            Log_OC.d(TAG, "Init the secondFragment again");
-            if (mDualPane) {
-                initFragmentsWithFile();                
-            }
         }
 
         // Action bar setup
diff --git a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
index 0697868b..03cf250f 100644
--- a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
@@ -181,7 +181,8 @@ public class PreviewMediaFragment extends FileFragment implements
             }
             
         } else {
-            setFile((OCFile)savedInstanceState.getParcelable(PreviewMediaFragment.EXTRA_FILE));
+            file = (OCFile)savedInstanceState.getParcelable(PreviewMediaFragment.EXTRA_FILE);
+            setFile(file);
             mAccount = savedInstanceState.getParcelable(PreviewMediaFragment.EXTRA_ACCOUNT);
             mSavedPlaybackPosition = 
                     savedInstanceState.getInt(PreviewMediaFragment.EXTRA_PLAY_POSITION);