From d0c0a52ab4dbd8e19ea3be8c4fb48685253e401b Mon Sep 17 00:00:00 2001
From: Brandon Presley <brandon@presley.nz>
Date: Mon, 13 Nov 2023 14:12:25 +1300
Subject: [PATCH] Simplify logic of AlarmService.playSound

This probably won't fix the disabling sound bug.
---
 android/app/src/main/java/com/massive/AlarmService.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/java/com/massive/AlarmService.kt b/android/app/src/main/java/com/massive/AlarmService.kt
index 4f149c7..fb4d9e4 100644
--- a/android/app/src/main/java/com/massive/AlarmService.kt
+++ b/android/app/src/main/java/com/massive/AlarmService.kt
@@ -57,11 +57,12 @@ class AlarmService : Service(), OnPreparedListener {
     }
 
     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?.start()
             mediaPlayer?.setOnCompletionListener { vibrator?.cancel() }
-        } else if (settings.sound != null && !settings.noSound) {
+        } else {
             mediaPlayer = MediaPlayer().apply {
                 setAudioAttributes(
                     AudioAttributes.Builder()