diff options
Diffstat (limited to 'core/src/main')
3 files changed, 12 insertions, 16 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java index a83e50506..06962d40d 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java @@ -791,8 +791,7 @@ public class PlaybackService extends MediaBrowserServiceCompat { // set sleep timer if auto-enabled if (newInfo.oldPlayerStatus != null && newInfo.oldPlayerStatus != PlayerStatus.SEEKING && SleepTimerPreferences.autoEnable() && !sleepTimerActive()) { - setSleepTimer(SleepTimerPreferences.timerMillis(), SleepTimerPreferences.shakeToReset(), - SleepTimerPreferences.vibrate()); + setSleepTimer(SleepTimerPreferences.timerMillis()); EventBus.getDefault().post(new MessageEvent(getString(R.string.sleep_timer_enabled_label), PlaybackService.this::disableSleepTimer)); } @@ -1055,9 +1054,9 @@ public class PlaybackService extends MediaBrowserServiceCompat { } } - public void setSleepTimer(long waitingTime, boolean shakeToReset, boolean vibrate) { + public void setSleepTimer(long waitingTime) { Log.d(TAG, "Setting sleep timer to " + waitingTime + " milliseconds"); - taskManager.setSleepTimer(waitingTime, shakeToReset, vibrate); + taskManager.setSleepTimer(waitingTime); sendNotificationBroadcast(NOTIFICATION_TYPE_SLEEPTIMER_UPDATE, 0); } diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java index 904c1508d..17cd1b24a 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java @@ -7,6 +7,7 @@ import android.os.Vibrator; import androidx.annotation.NonNull; import android.util.Log; +import de.danoeh.antennapod.core.preferences.SleepTimerPreferences; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -215,7 +216,7 @@ public class PlaybackServiceTaskManager { * * @throws java.lang.IllegalArgumentException if waitingTime <= 0 */ - public synchronized void setSleepTimer(long waitingTime, boolean shakeToReset, boolean vibrate) { + public synchronized void setSleepTimer(long waitingTime) { if (waitingTime <= 0) { throw new IllegalArgumentException("Waiting time <= 0"); } @@ -224,7 +225,7 @@ public class PlaybackServiceTaskManager { if (isSleepTimerActive()) { sleepTimerFuture.cancel(true); } - sleepTimer = new SleepTimer(waitingTime, shakeToReset, vibrate); + sleepTimer = new SleepTimer(waitingTime); sleepTimerFuture = schedExecutor.schedule(sleepTimer, 0, TimeUnit.MILLISECONDS); } @@ -361,17 +362,13 @@ public class PlaybackServiceTaskManager { private static final long NOTIFICATION_THRESHOLD = 10000; private final long waitingTime; private long timeLeft; - private final boolean shakeToReset; - private final boolean vibrate; private ShakeListener shakeListener; private final Handler handler; - public SleepTimer(long waitingTime, boolean shakeToReset, boolean vibrate) { + public SleepTimer(long waitingTime) { super(); this.waitingTime = waitingTime; this.timeLeft = waitingTime; - this.shakeToReset = shakeToReset; - this.vibrate = vibrate; if (UserPreferences.useExoplayer() && Looper.myLooper() == Looper.getMainLooper()) { // Run callbacks in main thread so they can call ExoPlayer methods themselves @@ -409,13 +406,13 @@ public class PlaybackServiceTaskManager { if (timeLeft < NOTIFICATION_THRESHOLD && !notifiedAlmostExpired) { Log.d(TAG, "Sleep timer is about to expire"); - if (vibrate) { + if (SleepTimerPreferences.vibrate()) { Vibrator v = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE); if (v != null) { v.vibrate(500); } } - if (shakeListener == null && shakeToReset) { + if (shakeListener == null && SleepTimerPreferences.shakeToReset()) { shakeListener = new ShakeListener(context, this); } postCallback(callback::onSleepTimerAlmostExpired); @@ -442,7 +439,7 @@ public class PlaybackServiceTaskManager { public void restart() { postCallback(() -> { - setSleepTimer(waitingTime, shakeToReset, vibrate); + setSleepTimer(waitingTime); callback.onSleepTimerReset(); }); if (shakeListener != null) { 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 8f7e5dc33..0b849aa1f 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 @@ -556,9 +556,9 @@ public class PlaybackController { } } - public void setSleepTimer(long time, boolean shakeToReset, boolean vibrate) { + public void setSleepTimer(long time) { if (playbackService != null) { - playbackService.setSleepTimer(time, shakeToReset, vibrate); + playbackService.setSleepTimer(time); } } |