Simplify logic of AlarmService.playSound
This probably won't fix the disabling sound bug.
This commit is contained in:
parent
79e462efc2
commit
d0c0a52ab4
|
@ -57,11 +57,12 @@ class AlarmService : Service(), OnPreparedListener {
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun playSound(settings: Settings) {
|
private fun playSound(settings: Settings) {
|
||||||
if (settings.sound == null && !settings.noSound) {
|
if (settings.noSound) return;
|
||||||
|
if (settings.sound == null) {
|
||||||
mediaPlayer = MediaPlayer.create(applicationContext, R.raw.argon)
|
mediaPlayer = MediaPlayer.create(applicationContext, R.raw.argon)
|
||||||
mediaPlayer?.start()
|
mediaPlayer?.start()
|
||||||
mediaPlayer?.setOnCompletionListener { vibrator?.cancel() }
|
mediaPlayer?.setOnCompletionListener { vibrator?.cancel() }
|
||||||
} else if (settings.sound != null && !settings.noSound) {
|
} else {
|
||||||
mediaPlayer = MediaPlayer().apply {
|
mediaPlayer = MediaPlayer().apply {
|
||||||
setAudioAttributes(
|
setAudioAttributes(
|
||||||
AudioAttributes.Builder()
|
AudioAttributes.Builder()
|
||||||
|
|
Loading…
Reference in New Issue