diff options
| author | ByteHamster <ByteHamster@users.noreply.github.com> | 2021-03-08 10:15:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-08 10:15:20 +0100 |
| commit | a49b4477a9abd6fdebb1241ba25d0e69975203a7 (patch) | |
| tree | 3fe4913c0066827aa14f0762db294906e47ec8be /core | |
| parent | 14c81265dcfcd2107a8c79172ca6506ddc75f803 (diff) | |
| parent | 5429d858efcd69f598cc053cc28503a3e65833f7 (diff) | |
| download | AntennaPod-a49b4477a9abd6fdebb1241ba25d0e69975203a7.zip | |
Merge pull request #5010 from ByteHamster/crash-fix
Various crash fixes reported in the beta
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java | 8 | ||||
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java | 6 |
2 files changed, 10 insertions, 4 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 9a8248984..8d3633b24 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 @@ -105,7 +105,9 @@ public class ExoPlayerWrapper implements IPlayer { @Override public void onSeekProcessed() { - audioSeekCompleteListener.onSeekComplete(null); + if (audioSeekCompleteListener != null) { + audioSeekCompleteListener.onSeekComplete(null); + } } }); } @@ -174,7 +176,9 @@ public class ExoPlayerWrapper implements IPlayer { @Override public void seekTo(int i) throws IllegalStateException { exoPlayer.seekTo(i); - audioSeekCompleteListener.onSeekComplete(null); + if (audioSeekCompleteListener != null) { + audioSeekCompleteListener.onSeekComplete(null); + } } @Override diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java index 117e32cd4..132919230 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java @@ -208,7 +208,9 @@ public abstract class PlaybackController { handleStatus(); } else { Log.w(TAG, "Couldn't receive status update: playbackService was null"); - bindToService(); + if (PlaybackService.isRunning) { + bindToService(); + } } } }; @@ -232,7 +234,7 @@ public abstract class PlaybackController { onBufferUpdate(progress); break; case PlaybackService.NOTIFICATION_TYPE_RELOAD: - if (playbackService == null) { + if (playbackService == null && PlaybackService.isRunning) { bindToService(); return; } |