fix Sithira#83: java.lang.IllegalStateException: Handler

bossly · Mar 30, 2024 · 5d8aa6e · 5d8aa6e
1 parent 7497484
commit 5d8aa6e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/...main/kotlin/me/sithiramunasinghe/flutter/flutter_radio_player/FlutterRadioPlayerPlugin.kt b/...main/kotlin/me/sithiramunasinghe/flutter/flutter_radio_player/FlutterRadioPlayerPlugin.kt
@@ -76,7 +76,7 @@ class FlutterRadioPlayerPlugin : FlutterPlugin, ActivityAware, MethodChannel.Met
 
     override fun onDetachedFromActivity() {
         if (isBound) {
-            frpRadioPlayerService.onDestroy()
+            frpRadioPlayerService.stop()
         }
         EventBus.getDefault().unregister(this)
     }

diff --git a/.../kotlin/me/sithiramunasinghe/flutter/flutter_radio_player/core/services/FRPCoreService.kt b/.../kotlin/me/sithiramunasinghe/flutter/flutter_radio_player/core/services/FRPCoreService.kt
@@ -108,6 +108,7 @@ class FRPCoreService : Service(), PlayerNotificationManager.NotificationListener
 
         if (exoPlayer != null) {
             exoPlayer?.release()
+            exoPlayer = null
         }
 
         mediaSessionConnector?.setPlayer(null)
@@ -268,31 +269,36 @@ class FRPCoreService : Service(), PlayerNotificationManager.NotificationListener
         }
     }
 
+    private fun postCurrentPlayingEvent() {
+        exoPlayer?.currentMediaItemIndex?.let {
+            if (it < mediaSourceList.count()) {
+                eventBus.post(FRPPlayerEvent(currentSource = updateCurrentPlaying(mediaSourceList[it])))
+            }
+        }
+    }
+
     fun nextMediaItem() {
         Log.i(TAG, "Seeking to next media item...")
         exoPlayer?.seekToNext()
         exoPlayer?.prepare()
         exoPlayer?.play()
-        val currentMedia = mediaSourceList[exoPlayer?.currentMediaItemIndex!!]
-        eventBus.post(FRPPlayerEvent(currentSource = updateCurrentPlaying(currentMedia)))
+        postCurrentPlayingEvent()
     }
 
     fun prevMediaItem() {
         Log.i(TAG, "Seeking to prev media item...")
         exoPlayer?.seekToPrevious()
         exoPlayer?.prepare()
         exoPlayer?.play()
-        val currentMedia = mediaSourceList[exoPlayer?.currentMediaItemIndex!!]
-        eventBus.post(FRPPlayerEvent(currentSource = updateCurrentPlaying(currentMedia)))
+        postCurrentPlayingEvent()
     }
 
     fun seekToMediaItem(index: Int, playIfReady: Boolean) {
         exoPlayer?.seekToDefaultPosition(index)
         exoPlayer?.apply {
             playWhenReady = playIfReady
         }
-        val currentMedia = mediaSourceList[exoPlayer?.currentMediaItemIndex!!]
-        eventBus.post(FRPPlayerEvent(currentSource = updateCurrentPlaying(currentMedia)))
+        postCurrentPlayingEvent()
     }
 
     fun setVolume(volume: Float) {