Use native video entity method for checking if a video is local or not

learning-layers · Apr 26, 2016 · 4d065cb · 4d065cb
1 parent 72dccdf
commit 4d065cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/app/src/main/java/fi/aalto/legroup/achso/playback/PlayerFragment.java b/app/src/main/java/fi/aalto/legroup/achso/playback/PlayerFragment.java
@@ -176,10 +176,8 @@ public void prepare(Video video, AnnotationEditor annotationEditor) {
         orientationPatcher.updateOrientation(video);
         orientationPatcher.setView(videoSurface);
 
-        System.out.println(URLUtil.isFileUrl(videoUri.toString()));
-
         // Seems as if the DefaultUriDataSource cannot correctly guess a local file URI, so just do it manually
-        if (URLUtil.isFileUrl(videoUri.toString()) == true) {
+        if (video.isLocal()) {
             dataSource = new FileDataSource();
         } else {
             String userAgent = Util.getUserAgent(getActivity(), "ACHSO");

diff --git a/app/src/main/java/fi/aalto/legroup/achso/storage/CombinedVideoRepository.java b/app/src/main/java/fi/aalto/legroup/achso/storage/CombinedVideoRepository.java
@@ -126,11 +126,11 @@ protected Video readVideoFromFile(File file) throws IOException {
         video.setLastModified(new Date(file.lastModified()));
         video.setRepository(this);
 
-        Uri videoUri = video.getVideoUri();
 
         // Sanity test to check if user deleted video file from gallery
         // Missing thumb nail icon is fine, since you can still watch the local video
-        if (URLUtil.isFileUrl(videoUri.toString())) {
+        if (video.isLocal()) {
+            Uri videoUri = video.getVideoUri();
             File sanityCheckFile = new File(videoUri.getPath());
 
             if (!sanityCheckFile.exists()) {