diff options
3 files changed, 9 insertions, 2 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java index d4008b3f2..0c64ea2b3 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java @@ -113,6 +113,11 @@ public class ExoPlayerWrapper implements IPlayer { } else { Throwable cause = error.getCause(); if (cause instanceof HttpDataSource.HttpDataSourceException) { + if (cause.getCause() != null) { + cause = cause.getCause(); + } + } + if (cause != null && "Source error".equals(cause.getMessage())) { cause = cause.getCause(); } audioErrorListener.accept(cause != null ? cause.getMessage() : error.getMessage()); diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackServiceStarter.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackServiceStarter.java index 061a976dc..3efded9ed 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackServiceStarter.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackServiceStarter.java @@ -2,6 +2,7 @@ package de.danoeh.antennapod.core.util.playback; import android.content.Context; import android.content.Intent; +import android.os.Parcelable; import androidx.core.content.ContextCompat; import de.danoeh.antennapod.core.preferences.PlaybackPreferences; @@ -66,7 +67,7 @@ public class PlaybackServiceStarter { public Intent getIntent() { Intent launchIntent = new Intent(context, PlaybackService.class); - launchIntent.putExtra(PlaybackService.EXTRA_PLAYABLE, media); + launchIntent.putExtra(PlaybackService.EXTRA_PLAYABLE, (Parcelable) media); launchIntent.putExtra(PlaybackService.EXTRA_START_WHEN_PREPARED, startWhenPrepared); launchIntent.putExtra(PlaybackService.EXTRA_SHOULD_STREAM, shouldStream); launchIntent.putExtra(PlaybackService.EXTRA_PREPARE_IMMEDIATELY, prepareImmediately); diff --git a/model/src/main/java/de/danoeh/antennapod/model/playback/Playable.java b/model/src/main/java/de/danoeh/antennapod/model/playback/Playable.java index 151be92e6..7120f76ea 100644 --- a/model/src/main/java/de/danoeh/antennapod/model/playback/Playable.java +++ b/model/src/main/java/de/danoeh/antennapod/model/playback/Playable.java @@ -7,13 +7,14 @@ import android.os.Parcelable; import androidx.annotation.Nullable; import de.danoeh.antennapod.model.feed.Chapter; +import java.io.Serializable; import java.util.Date; import java.util.List; /** * Interface for objects that can be played by the PlaybackService. */ -public interface Playable extends Parcelable { +public interface Playable extends Parcelable, Serializable { int INVALID_TIME = -1; /** |