Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2832 from ByteHamster/null-media-player

Browse Source 
Do not crash if mediaPlayer is null
This commit is contained in:
Martin Fietz 2018-09-27 13:53:41 +02:00 committed by GitHub
commit 0ca7fc60b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java
View File

@ -44,8 +44,8 @@ public class PlayerWidgetJobService extends JobIntentService {
return; return;
} }
if (PlaybackService.isRunning && playbackService == null) { synchronized (waitForService) {
synchronized (waitForService) { if (PlaybackService.isRunning && playbackService == null) {
bindService(new Intent(this, PlaybackService.class), mConnection, 0); bindService(new Intent(this, PlaybackService.class), mConnection, 0);
while (playbackService == null) { while (playbackService == null) {
try { try {

6
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
View File

@ -1685,6 +1685,9 @@ public class PlaybackService extends MediaBrowserServiceCompat {
* an invalid state. * an invalid state.
*/ */
public int getDuration() { public int getDuration() {
if (mediaPlayer == null) {
return INVALID_TIME;
}
return mediaPlayer.getDuration(); return mediaPlayer.getDuration();
} }
@ -1693,6 +1696,9 @@ public class PlaybackService extends MediaBrowserServiceCompat {
* is in an invalid state. * is in an invalid state.
*/ */
public int getCurrentPosition() { public int getCurrentPosition() {
if (mediaPlayer == null) {
return INVALID_TIME;
}
return mediaPlayer.getPosition(); return mediaPlayer.getPosition();
} }