projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
2c5527c
..
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;
@@
-439,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());
}
}
@@
-491,7
+491,7
@@
public class PreviewMediaFragment extends FileFragment implements
mVideoPreview.stopPlayback();
mAutoplay = false;
mSavedPlaybackPosition = 0;
mVideoPreview.stopPlayback();
mAutoplay = false;
mSavedPlaybackPosition = 0;
- mVideoPreview.setVideo
Path(getFile().getStoragePath
());
+ mVideoPreview.setVideo
URI(getFile().getStorageUri
());
}
}
} // else : called from onError()
}
}
} // else : called from onError()