summaryrefslogtreecommitdiff
path: root/core/src/main/java/de
diff options
context:
space:
mode:
authorMartin Fietz <Martin.Fietz@gmail.com>2018-04-01 23:21:27 +0200
committerGitHub <noreply@github.com>2018-04-01 23:21:27 +0200
commit9cd9d455c85122bc919651ff4ccd75048f5da76d (patch)
tree5decd2c47ccd366359aacac21522619b3d2b4b8c /core/src/main/java/de
parent894c7b63606c98e8d65b5e81266bab351cf4f35c (diff)
parent4213d8fc8b656a94a6f01081ff96ca3e17fc8645 (diff)
downloadAntennaPod-9cd9d455c85122bc919651ff4ccd75048f5da76d.zip
Merge pull request #2568 from ByteHamster/crashfix
Fixed crash if media file exists but can not be read
Diffstat (limited to 'core/src/main/java/de')
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java
index 5f205c515..af735aefd 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java
@@ -11,6 +11,7 @@ import android.view.SurfaceHolder;
import org.antennapod.audio.MediaPlayer;
+import java.io.File;
import java.io.IOException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Future;
@@ -165,8 +166,10 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer {
callback.onMediaChanged(false);
if (stream) {
mediaPlayer.setDataSource(media.getStreamUrl());
- } else {
+ } else if (new File(media.getLocalMediaUrl()).canRead()) {
mediaPlayer.setDataSource(media.getLocalMediaUrl());
+ } else {
+ throw new IOException("Unable to read local file " + media.getLocalMediaUrl());
}
setPlayerStatus(PlayerStatus.INITIALIZED, media);