[tx-robot] updated from transifex

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / preview / PreviewMediaFragment.java

diff --git a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
index 0dbb1a3..ee9180d 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
@@ -36,8 +36,6 @@ import android.media.MediaPlayer;
 import android.media.MediaPlayer.OnCompletionListener;
 import android.media.MediaPlayer.OnErrorListener;
 import android.media.MediaPlayer.OnPreparedListener;
 import android.media.MediaPlayer.OnCompletionListener;
 import android.media.MediaPlayer.OnErrorListener;
 import android.media.MediaPlayer.OnPreparedListener;

-import android.net.Uri;
-import android.os.Build;

 import android.os.Bundle;
 import android.os.IBinder;
 import android.view.LayoutInflater;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.view.LayoutInflater;


@@ -153,7 +151,7 @@ public class PreviewMediaFragment extends FileFragment implements
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);

-        Log_OC.e(TAG, "onCreateView");
+        Log_OC.v(TAG, "onCreateView");

 
 
         mView = inflater.inflate(R.layout.file_preview, container, false);
 
 
         mView = inflater.inflate(R.layout.file_preview, container, false);


@@ -174,7 +172,7 @@ public class PreviewMediaFragment extends FileFragment implements
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);

-        Log_OC.e(TAG, "onActivityCreated");
+        Log_OC.v(TAG, "onActivityCreated");

 
         OCFile file = getFile();
         if (savedInstanceState == null) {
 
         OCFile file = getFile();
         if (savedInstanceState == null) {


@@ -244,7 +242,7 @@ public class PreviewMediaFragment extends FileFragment implements
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);

-        Log_OC.e(TAG, "onSaveInstanceState");
+        Log_OC.v(TAG, "onSaveInstanceState");

 
         outState.putParcelable(PreviewMediaFragment.EXTRA_FILE, getFile());
         outState.putParcelable(PreviewMediaFragment.EXTRA_ACCOUNT, mAccount);
 
         outState.putParcelable(PreviewMediaFragment.EXTRA_FILE, getFile());
         outState.putParcelable(PreviewMediaFragment.EXTRA_ACCOUNT, mAccount);


@@ -268,7 +266,7 @@ public class PreviewMediaFragment extends FileFragment implements
     @Override
     public void onStart() {
         super.onStart();
     @Override
     public void onStart() {
         super.onStart();

-        Log_OC.e(TAG, "onStart");
+        Log_OC.v(TAG, "onStart");

 
         OCFile file = getFile();
         if (file != null && file.isDown()) {
 
         OCFile file = getFile();
         if (file != null && file.isDown()) {


@@ -351,13 +349,7 @@ public class PreviewMediaFragment extends FileFragment implements
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.action_share_file: {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.action_share_file: {

-                stopPreview(false);
-                mContainerActivity.getFileOperationsHelper().shareFileWithLink(getFile());
-                return true;
-            }
-            case R.id.action_unshare_file: {
-                stopPreview(false);
-                mContainerActivity.getFileOperationsHelper().unshareFileWithLink(getFile());
+                seeShareFile();

                 return true;
             }
             case R.id.action_open_file_with: {
                 return true;
             }
             case R.id.action_open_file_with: {


@@ -398,7 +390,7 @@ public class PreviewMediaFragment extends FileFragment implements
     /**
      * Update the file of the fragment with file value
      *
     /**
      * Update the file of the fragment with file value
      *

-     * @param file
+     * @param file      Replaces the held file with a new one

      */
     public void updateFile(OCFile file) {
         setFile(file);
      */
     public void updateFile(OCFile file) {
         setFile(file);


@@ -415,6 +407,10 @@ public class PreviewMediaFragment extends FileFragment implements
         mContainerActivity.showDetails(getFile());
     }
 
         mContainerActivity.showDetails(getFile());
     }
 

+    private void seeShareFile() {
+        stopPreview(false);
+        mContainerActivity.getFileOperationsHelper().showShareFile(getFile());
+    }

 
     private void prepareVideo() {
         // create helper to get more control on the playback
 
     private void prepareVideo() {
         // create helper to get more control on the playback


@@ -431,8 +427,7 @@ public class PreviewMediaFragment extends FileFragment implements
 
         // load the video file in the video player ; 
         // when done, VideoHelper#onPrepared() will be called
 
         // load the video file in the video player ; 
         // when done, VideoHelper#onPrepared() will be called

-        Uri uri = Uri.parse(getFile().getStoragePath());
-        mVideoPreview.setVideoPath(uri.encode(getFile().getStoragePath()));
+        mVideoPreview.setVideoURI(getFile().getStorageUri());

     }
 
 
     }
 
 


@@ -447,7 +442,7 @@ public class PreviewMediaFragment extends FileFragment implements
          */
         @Override
         public void onPrepared(MediaPlayer vp) {
          */
         @Override
         public void onPrepared(MediaPlayer vp) {

-            Log_OC.e(TAG, "onPrepared");
+            Log_OC.v(TAG, "onPrepared");

             mVideoPreview.seekTo(mSavedPlaybackPosition);
             if (mAutoplay) {
                 mVideoPreview.start();
             mVideoPreview.seekTo(mSavedPlaybackPosition);
             if (mAutoplay) {
                 mVideoPreview.start();


@@ -467,25 +462,9 @@ public class PreviewMediaFragment extends FileFragment implements
          */
         @Override
         public void onCompletion(MediaPlayer mp) {
          */
         @Override
         public void onCompletion(MediaPlayer mp) {

-            Log_OC.e(TAG, "completed");
+            Log_OC.v(TAG, "completed");

             if (mp != null) {
                 mVideoPreview.seekTo(0);
             if (mp != null) {
                 mVideoPreview.seekTo(0);

-                // next lines are necessary to work around undesired video loops
-                if (Build.VERSION.SDK_INT == Build.VERSION_CODES.GINGERBREAD) {
-                    mVideoPreview.pause();
-
-                }
-                else {
-                    if (Build.VERSION.SDK_INT == Build.VERSION_CODES.GINGERBREAD_MR1) {
-                        // mVideePreview.pause() is not enough
-
-                        mMediaController.setEnabled(false);
-                        mVideoPreview.stopPlayback();
-                        mAutoplay = false;
-                        mSavedPlaybackPosition = 0;
-                        mVideoPreview.setVideoPath(getFile().getStoragePath());
-                    }
-                }

             } // else : called from onError()
             mMediaController.updatePausePlay();
         }
             } // else : called from onError()
             mMediaController.updatePausePlay();
         }


@@ -500,6 +479,7 @@ public class PreviewMediaFragment extends FileFragment implements
          */
         @Override
         public boolean onError(MediaPlayer mp, int what, int extra) {
          */
         @Override
         public boolean onError(MediaPlayer mp, int what, int extra) {

+            Log_OC.e(TAG, "Error in video playback, what = " + what + ", extra = " + extra);

             if (mVideoPreview.getWindowToken() != null) {
                 String message = MediaService.getMessageForMediaError(
                         getActivity(), what, extra);
             if (mVideoPreview.getWindowToken() != null) {
                 String message = MediaService.getMessageForMediaError(
                         getActivity(), what, extra);


@@ -523,25 +503,25 @@ public class PreviewMediaFragment extends FileFragment implements
 
     @Override
     public void onPause() {
 
     @Override
     public void onPause() {

-        Log_OC.e(TAG, "onPause");
+        Log_OC.v(TAG, "onPause");

         super.onPause();
     }
 
     @Override
     public void onResume() {
         super.onResume();
         super.onPause();
     }
 
     @Override
     public void onResume() {
         super.onResume();

-        Log_OC.e(TAG, "onResume");
+        Log_OC.v(TAG, "onResume");

     }
 
     @Override
     public void onDestroy() {
     }
 
     @Override
     public void onDestroy() {

-        Log_OC.e(TAG, "onDestroy");
+        Log_OC.v(TAG, "onDestroy");

         super.onDestroy();
     }
 
     @Override
     public void onStop() {
         super.onDestroy();
     }
 
     @Override
     public void onStop() {

-        Log_OC.e(TAG, "onStop");
+        Log_OC.v(TAG, "onStop");

 
         mPrepared = false;
         if (mMediaServiceConnection != null) {
 
         mPrepared = false;
         if (mMediaServiceConnection != null) {


@@ -582,12 +562,12 @@ public class PreviewMediaFragment extends FileFragment implements
 
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
 
     @Override
     public void onConfigurationChanged(Configuration newConfig) {

-        Log_OC.e(TAG, "onConfigurationChanged " + this);
+        Log_OC.v(TAG, "onConfigurationChanged " + this);

     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {

-        Log_OC.e(TAG, "onActivityResult " + this);
+        Log_OC.v(TAG, "onActivityResult " + this);

         super.onActivityResult(requestCode, resultCode, data);
         if (resultCode == Activity.RESULT_OK) {
             mSavedPlaybackPosition = data.getExtras().getInt(
         super.onActivityResult(requestCode, resultCode, data);
         if (resultCode == Activity.RESULT_OK) {
             mSavedPlaybackPosition = data.getExtras().getInt(


@@ -661,7 +641,7 @@ public class PreviewMediaFragment extends FileFragment implements
         @Override
         public void onServiceDisconnected(ComponentName component) {
             if (component.equals(new ComponentName(getActivity(), MediaService.class))) {
         @Override
         public void onServiceDisconnected(ComponentName component) {
             if (component.equals(new ComponentName(getActivity(), MediaService.class))) {

-                Log_OC.e(TAG, "Media service suddenly disconnected");
+                Log_OC.w(TAG, "Media service suddenly disconnected");

                 if (mMediaController != null) {
                     mMediaController.setMediaPlayer(null);
                 }
                 if (mMediaController != null) {
                     mMediaController.setMediaPlayer(null);
                 }


@@ -725,7 +705,7 @@ public class PreviewMediaFragment extends FileFragment implements
         if (mPrepared) {
             mSavedPlaybackPosition = mVideoPreview.getCurrentPosition();
         }
         if (mPrepared) {
             mSavedPlaybackPosition = mVideoPreview.getCurrentPosition();
         }

-        Log_OC.e(TAG, "getting position: " + mSavedPlaybackPosition);
+        Log_OC.v(TAG, "getting position: " + mSavedPlaybackPosition);

         return mSavedPlaybackPosition;
     }
 
         return mSavedPlaybackPosition;
     }