diff options
Diffstat (limited to 'app')
4 files changed, 5 insertions, 19 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java index 116709587..de65ca406 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java @@ -613,11 +613,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements Log.d(TAG, "onResume()"); StorageUtils.checkStorageAvailability(this); if (controller != null) { - if (PlaybackService.isRunning) { - controller.init(); - } else { - controller.resumeServiceNotRunning(); - } + controller.init(); } } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java index 31b0ce333..3f8f871c2 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java @@ -81,15 +81,11 @@ public class DefaultActionButtonCallback implements ActionButtonCallback { } } else { // media is downloaded if (item.hasMedia() && item.getMedia().isCurrentlyPlaying()) { - if (!PlaybackService.isRunning) { - PlaybackService.startService(context, media, true, false); - } + PlaybackService.startIfNotRunning(context, media, true, false); context.sendBroadcast(new Intent(PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE)); } else if (item.hasMedia() && item.getMedia().isCurrentlyPaused()) { - if (!PlaybackService.isRunning) { - PlaybackService.startService(context, media, true, false); - } + PlaybackService.startIfNotRunning(context, media, true, false); context.sendBroadcast(new Intent(PlaybackService.ACTION_RESUME_PLAY_CURRENT_EPISODE)); } else { diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java index e75f312d3..27df29f9f 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java @@ -127,11 +127,7 @@ public class ExternalPlayerFragment extends Fragment { @Override public void onResume() { super.onResume(); - if (PlaybackService.isRunning) { - controller.init(); - } else { - controller.resumeServiceNotRunning(); - } + controller.init(); onPositionObserverUpdate(); } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java index 7078eeb63..5088d71a6 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java @@ -244,9 +244,7 @@ public class ItemFragment extends Fragment implements OnSwipeGesture { if (item.hasMedia()) { FeedMedia media = item.getMedia(); if (!media.isDownloaded()) { - if (!PlaybackService.isRunning) { - PlaybackService.startService(getActivity(), media, true, false); - } + PlaybackService.startIfNotRunning(getActivity(), media, true, false); DBTasks.playMedia(getActivity(), media, true, true, true); ((MainActivity) getActivity()).dismissChildFragment(); } else { |