Fixed (tablet landscape): video playback is resumed in the moment it was left when...

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 6d1524f..fe91e87 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -214,7 +214,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         mFileList = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
         mDualPane = (findViewById(R.id.file_details_container) != null);\r
         if (mDualPane) {\r
         mFileList = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
         mDualPane = (findViewById(R.id.file_details_container) != null);\r
         if (mDualPane) {\r

-            initFileDetailsInDualPane();\r
+            if (savedInstanceState == null) initFileDetailsInDualPane();\r

         } else {\r
             // quick patchES to fix problem in turn from landscape to portrait, when a file is selected in the right pane\r
             // TODO serious refactorization in activities and fragments providing file browsing and handling \r
         } else {\r
             // quick patchES to fix problem in turn from landscape to portrait, when a file is selected in the right pane\r
             // TODO serious refactorization in activities and fragments providing file browsing and handling \r


@@ -579,6 +579,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         Log.d(getClass().toString(), "onSaveInstanceState() end");\r
     }\r
 \r
         Log.d(getClass().toString(), "onSaveInstanceState() end");\r
     }\r
 \r

+    \r

     @Override\r
     public void onResume() {\r
         Log.d(getClass().toString(), "onResume() start");\r
     @Override\r
     public void onResume() {\r
         Log.d(getClass().toString(), "onResume() start");\r

diff --git a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
index b24bf9b..35afe15 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
@@ -235,8 +235,10 @@ public class PreviewMediaFragment extends SherlockFragment implements
         outState.putParcelable(PreviewMediaFragment.EXTRA_ACCOUNT, mAccount);
         
         if (mFile.isVideo()) {
         outState.putParcelable(PreviewMediaFragment.EXTRA_ACCOUNT, mAccount);
         
         if (mFile.isVideo()) {

-            outState.putInt(PreviewMediaFragment.EXTRA_PLAY_POSITION , mVideoPreview.getCurrentPosition());
-            outState.putBoolean(PreviewMediaFragment.EXTRA_PLAYING , mVideoPreview.isPlaying());
+            mSavedPlaybackPosition = mVideoPreview.getCurrentPosition();
+            mAutoplay = mVideoPreview.isPlaying();
+            outState.putInt(PreviewMediaFragment.EXTRA_PLAY_POSITION , mSavedPlaybackPosition);
+            outState.putBoolean(PreviewMediaFragment.EXTRA_PLAYING , mAutoplay);

         } else {
             outState.putInt(PreviewMediaFragment.EXTRA_PLAY_POSITION , mMediaServiceBinder.getCurrentPosition());
             outState.putBoolean(PreviewMediaFragment.EXTRA_PLAYING , mMediaServiceBinder.isPlaying());
         } else {
             outState.putInt(PreviewMediaFragment.EXTRA_PLAY_POSITION , mMediaServiceBinder.getCurrentPosition());
             outState.putBoolean(PreviewMediaFragment.EXTRA_PLAYING , mMediaServiceBinder.isPlaying());