feat: make Media Button configurable and clean

cladam · cladam · commit 1c975206582c · 2026-03-04T10:00:22.000+01:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -47,8 +47,8 @@ android {
         applicationId = "com.ilseon"
         minSdk = 24
         targetSdk = 36
-        versionCode = 120
-        versionName = "0.39.0"
+        versionCode = 121
+        versionName = "0.40.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -17,7 +17,6 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
 
     <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
 
@@ -80,10 +79,14 @@
         <receiver
             android:name=".notifications.ReminderBroadcastReceiver"
             android:enabled="true"
-            android:exported="false">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="com.ilseon.REMINDER_NOTIFICATION" />
+                <action android:name="com.ilseon.REMINDER_HAPTIC" />
+            </intent-filter>
         </receiver>
 
         <receiver
@@ -106,8 +109,29 @@
             android:name=".service.RecordingService"
             android:enabled="true"
             android:exported="false"
-            android:foregroundServiceType="microphone" />
+            android:foregroundServiceType="microphone">
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </service>
+
+        <!-- Both receivers must remain: the system persists the last known media button
+             receiver ComponentName across reboots. Different builds registered different
+             receivers, so we keep both to ensure delivery regardless of which one the
+             system has cached. Both forward to RecordingService. -->
+        <receiver android:name=".service.MediaButtonBroadcastReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </receiver>
 
+        <receiver android:name="androidx.media.session.MediaButtonReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </receiver>
 
     </application>
 
diff --git a/app/src/main/java/com/ilseon/IlseonApplication.kt b/app/src/main/java/com/ilseon/IlseonApplication.kt
@@ -1,13 +1,21 @@
 package com.ilseon
 
 import android.app.Application
+import android.content.Intent
+import android.os.Build
 import androidx.work.Configuration
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
+import com.ilseon.data.task.SettingsRepository
 import com.ilseon.notifications.NotificationHelper
 import com.ilseon.service.HapticWorker
+import com.ilseon.service.RecordingService
 import dagger.hilt.android.HiltAndroidApp
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
@@ -17,13 +25,31 @@ class IlseonApplication : Application(), Configuration.Provider {
     @Inject
     lateinit var notificationHelper: NotificationHelper
 
+    @Inject
+    lateinit var settingsRepository: SettingsRepository
+
     override val workManagerConfiguration: Configuration
         get() = Configuration.Builder().build()
 
     override fun onCreate() {
         super.onCreate()
         notificationHelper.createNotificationChannels()
         setupHapticWorker()
+        startRecordingServiceIfNeeded()
+    }
+
+    private fun startRecordingServiceIfNeeded() {
+        CoroutineScope(Dispatchers.Main).launch {
+            val enabled = settingsRepository.mediaButtonTriggerEnabled.first()
+            if (enabled) {
+                val intent = Intent(this@IlseonApplication, RecordingService::class.java)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    startForegroundService(intent)
+                } else {
+                    startService(intent)
+                }
+            }
+        }
     }
 
     private fun setupHapticWorker() {
diff --git a/app/src/main/java/com/ilseon/SettingsViewModel.kt b/app/src/main/java/com/ilseon/SettingsViewModel.kt
@@ -1,5 +1,8 @@
 package com.ilseon
 
+import android.content.Context
+import android.content.Intent
+import android.os.Build
 import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -12,7 +15,9 @@ import com.ilseon.data.task.ReflectionExporter
 import com.ilseon.data.task.ReflectionImporter
 import com.ilseon.data.task.SettingsRepository
 import com.ilseon.data.task.TaskRepository
+import com.ilseon.service.RecordingService
 import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.stateIn
@@ -22,6 +27,7 @@ import kotlin.onFailure
 
 @HiltViewModel
 class SettingsViewModel @Inject constructor(
+    @ApplicationContext private val context: Context,
     private val settingsRepository: SettingsRepository,
     private val taskRepository: TaskRepository,
     private val reflectionExporter: ReflectionExporter,
@@ -85,6 +91,17 @@ class SettingsViewModel @Inject constructor(
         viewModelScope.launch {
             settingsRepository.setMediaButtonTriggerEnabled(enabled)
         }
+        // Start/stop the RecordingService so the MediaSession is alive to receive events
+        val serviceIntent = Intent(context, RecordingService::class.java)
+        if (enabled) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                context.startForegroundService(serviceIntent)
+            } else {
+                context.startService(serviceIntent)
+            }
+        } else {
+            context.stopService(serviceIntent)
+        }
     }
 
     fun setSstLanguage(language: String) {
diff --git a/app/src/main/java/com/ilseon/notifications/ReminderBroadcastReceiver.kt b/app/src/main/java/com/ilseon/notifications/ReminderBroadcastReceiver.kt
@@ -8,8 +8,14 @@ import android.content.pm.PackageManager
 import android.os.Build
 import androidx.core.content.ContextCompat
 import com.ilseon.data.task.SchedulingType
+import com.ilseon.data.task.SettingsRepository
 import com.ilseon.data.task.TimerState
+import com.ilseon.service.RecordingService
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -18,9 +24,33 @@ class ReminderBroadcastReceiver : BroadcastReceiver() {
     @Inject
     lateinit var notificationHelper: NotificationHelper
 
+    @Inject
+    lateinit var settingsRepository: SettingsRepository
+
     override fun onReceive(context: Context, intent: Intent) {
-        if (intent.action == "com.ilseon.REMINDER_NOTIFICATION") {
-            handleNotification(context, intent)
+        when (intent.action) {
+            Intent.ACTION_BOOT_COMPLETED -> handleBootCompleted(context)
+            "com.ilseon.REMINDER_NOTIFICATION" -> handleNotification(context, intent)
+        }
+    }
+
+    private fun handleBootCompleted(context: Context) {
+        // Start RecordingService on boot if media button trigger is enabled
+        val pendingResult = goAsync()
+        CoroutineScope(Dispatchers.Main).launch {
+            try {
+                val enabled = settingsRepository.mediaButtonTriggerEnabled.first()
+                if (enabled) {
+                    val serviceIntent = Intent(context, RecordingService::class.java)
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        context.startForegroundService(serviceIntent)
+                    } else {
+                        context.startService(serviceIntent)
+                    }
+                }
+            } finally {
+                pendingResult.finish()
+            }
         }
     }
 
diff --git a/app/src/main/java/com/ilseon/service/MediaButtonBroadcastReceiver.kt b/app/src/main/java/com/ilseon/service/MediaButtonBroadcastReceiver.kt
@@ -0,0 +1,47 @@
+package com.ilseon.service
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.util.Log
+import android.view.KeyEvent
+
+/**
+ * Receives MEDIA_BUTTON broadcasts from the system and forwards them to RecordingService.
+ * Only forwards if the media button trigger setting is enabled — otherwise does nothing
+ * so other apps (e.g. Spotify) can handle the event.
+ */
+class MediaButtonBroadcastReceiver : BroadcastReceiver() {
+
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.action != Intent.ACTION_MEDIA_BUTTON) return
+
+        // Check if the user has enabled the media button trigger
+        val prefs = context.getSharedPreferences("app_settings", Context.MODE_PRIVATE)
+        val enabled = prefs.getBoolean("media_button_trigger_enabled", false)
+        if (!enabled) {
+            Log.d("MediaButtonReceiver", "Media button trigger disabled, ignoring")
+            return
+        }
+
+        Log.d("MediaButtonReceiver", "onReceive: forwarding to RecordingService")
+
+        val serviceIntent = Intent(Intent.ACTION_MEDIA_BUTTON).apply {
+            setClass(context, RecordingService::class.java)
+            intent.getParcelableExtra<KeyEvent>(Intent.EXTRA_KEY_EVENT)?.let {
+                putExtra(Intent.EXTRA_KEY_EVENT, it)
+            }
+        }
+
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                context.startForegroundService(serviceIntent)
+            } else {
+                context.startService(serviceIntent)
+            }
+        } catch (e: Exception) {
+            Log.e("MediaButtonReceiver", "Failed to start RecordingService", e)
+        }
+    }
+}
diff --git a/app/src/main/java/com/ilseon/service/RecordingService.kt b/app/src/main/java/com/ilseon/service/RecordingService.kt
