Merge pull request #3 from masterwok/1.1.16

1.1.16
masterwok · Feb 28, 2019 · 52e752b · 52e752b
2 parents adc584a + 458e597
commit 52e752b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ and add the following in the dependent module:
 
 ```gradle
 dependencies {
-    implementation 'com.github.masterwok:simple-vlc-player:1.1.15'
+    implementation 'com.github.masterwok:simple-vlc-player:1.1.16'
 }
 ```
 

diff --git a/simplevlcplayer/src/main/java/com/masterwok/simplevlcplayer/fragments/CastPlayerFragment.kt b/simplevlcplayer/src/main/java/com/masterwok/simplevlcplayer/fragments/CastPlayerFragment.kt
@@ -95,6 +95,8 @@ internal class CastPlayerFragment : MediaPlayerServiceFragment()
     }
 
     override fun onServiceConnected() {
+        serviceBinder?.callback = this
+
         startPlayback()
     }
 
@@ -151,10 +153,12 @@ internal class CastPlayerFragment : MediaPlayerServiceFragment()
     }
 
     override fun onPlayerStopped() {
-        // Intentionally left blank..
+        serviceBinder?.callback = null
+        activity?.finish()
     }
 
     override fun onPlayerEndReached() {
+        serviceBinder?.callback = null
         activity?.finish()
     }
 

diff --git a/simplevlcplayer/src/main/java/com/masterwok/simplevlcplayer/services/MediaPlayerService.kt b/simplevlcplayer/src/main/java/com/masterwok/simplevlcplayer/services/MediaPlayerService.kt
@@ -78,7 +78,7 @@ class MediaPlayerService : InjectableService(), MediaPlayer.Callback, Dialog.Cal
         private const val MediaPlayerServiceChannelName = "Media Player Service"
         private const val MediaPlayerServiceChannelId = "channel.mediaplayerservice"
         private const val SimpleVlcSessionTag = "tag.simplevlcsession"
-        private const val MediaPlayerServiceNotificationId = 32106
+        private const val MediaPlayerServiceNotificationId = 1
 
         private fun getPauseAction(context: Context): NotificationCompat.Action {
             return NotificationCompat.Action(
@@ -459,6 +459,10 @@ class MediaPlayerService : InjectableService(), MediaPlayer.Callback, Dialog.Cal
             player?.pause()
         }
 
+        override fun onStop() {
+            super.onStop()
+        }
+
         override fun onMediaButtonEvent(mediaButtonEvent: Intent): Boolean {
             val action = mediaButtonEvent.action