Fixed local URI to video files passed to VideoView

[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 cc0f064..b0578c2 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
@@ -21,6 +21,7 @@ package com.owncloud.android.ui.preview;
 
 import android.accounts.Account;
 import android.app.Activity;
 
 import android.accounts.Account;
 import android.app.Activity;

+import android.content.ContentResolver;

 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.media.MediaMetadataRetriever;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.media.MediaMetadataRetriever;


@@ -355,6 +356,10 @@ public class PreviewMediaFragment extends FileFragment implements
                 mContainerActivity.getFileOperationsHelper().shareFileWithLink(getFile());
                 return true;
             }
                 mContainerActivity.getFileOperationsHelper().shareFileWithLink(getFile());
                 return true;
             }

+            case R.id.action_share_with_users: {
+                seeShareFile();
+                return true;
+            }

             case R.id.action_unshare_file: {
                 stopPreview(false);
                 mContainerActivity.getFileOperationsHelper().unshareFileWithLink(getFile());
             case R.id.action_unshare_file: {
                 stopPreview(false);
                 mContainerActivity.getFileOperationsHelper().unshareFileWithLink(getFile());


@@ -378,7 +383,7 @@ public class PreviewMediaFragment extends FileFragment implements
                 return true;
             }
             case R.id.action_sync_file: {
                 return true;
             }
             case R.id.action_sync_file: {

-                mContainerActivity.getFileOperationsHelper().syncFile(getFile(), true);
+                mContainerActivity.getFileOperationsHelper().syncFile(getFile());

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


@@ -415,6 +420,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 +440,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());

     }
 
 
     }
 
 


@@ -483,7 +491,7 @@ public class PreviewMediaFragment extends FileFragment implements
                         mVideoPreview.stopPlayback();
                         mAutoplay = false;
                         mSavedPlaybackPosition = 0;
                         mVideoPreview.stopPlayback();
                         mAutoplay = false;
                         mSavedPlaybackPosition = 0;

-                        mVideoPreview.setVideoPath(getFile().getStoragePath());
+                        mVideoPreview.setVideoURI(getFile().getStorageUri());

                     }
                 }
             } // else : called from onError()
                     }
                 }
             } // else : called from onError()