Merge pull request #1946 from PaulWoitaschek/session_crash_fixes

Session crash fixes
PaulWoitaschek · May 28, 2023 · f9cb8c4 · f9cb8c4
2 parents f580526 + 5718f07
commit f9cb8c4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/playback/src/main/kotlin/voice/playback/PlayerController.kt b/playback/src/main/kotlin/voice/playback/PlayerController.kt
@@ -16,6 +16,7 @@ import voice.common.BookId
 import voice.common.pref.CurrentBook
 import voice.data.ChapterId
 import voice.data.repo.BookRepository
+import voice.logging.core.Logger
 import voice.playback.misc.Decibel
 import voice.playback.session.CustomCommand
 import voice.playback.session.MediaId
@@ -66,7 +67,7 @@ class PlayerController
 
   fun pauseIfCurrentBookDifferentFrom(id: BookId) {
     scope.launch {
-      val controller = awaitConnect()
+      val controller = awaitConnect() ?: return@launch
       val currentBookId = controller.currentBookId()
       if (currentBookId != null && currentBookId != id) {
         controller.pause()
@@ -150,12 +151,19 @@ class PlayerController
 
   private inline fun executeAfterPrepare(crossinline action: suspend (MediaController) -> Unit) {
     scope.launch {
-      val controller = controller.await()
+      val controller = awaitConnect() ?: return@launch
       if (maybePrepare(controller)) {
         action(controller)
       }
     }
   }
 
-  suspend fun awaitConnect(): MediaController = controller.await()
+  suspend fun awaitConnect(): MediaController? {
+    return try {
+      controller.await()
+    } catch (e: Exception) {
+      Logger.e(e, "Error while connecting to media controller")
+      null
+    }
+  }
 }
diff --git a/playback/src/main/kotlin/voice/playback/session/PlaybackService.kt b/playback/src/main/kotlin/voice/playback/session/PlaybackService.kt
@@ -6,6 +6,7 @@ import androidx.media3.session.MediaSession
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.cancel
 import voice.common.rootComponentAs
+import voice.logging.core.Logger
 import voice.playback.di.PlaybackComponent
 import voice.playback.player.VoicePlayer
 import javax.inject.Inject
@@ -33,6 +34,15 @@ class PlaybackService : MediaLibraryService() {
     setMediaNotificationProvider(voiceNotificationProvider)
   }
 
+  override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+    return try {
+      super.onStartCommand(intent, flags, startId)
+    } catch (e: SecurityException) {
+      Logger.e(e, "onStartCommand crashed")
+      START_STICKY
+    }
+  }
+
   override fun onDestroy() {
     super.onDestroy()
     release()