@javascriptcommon/react-native-track-player 1.2.25 → 1.2.26

package/android/src/main/java/com/guichaguri/trackplayer/service/MusicService.kt

@@ -18,9 +18,12 @@ import android.support.v4.media.MediaBrowserCompat.MediaItem
 import android.support.v4.media.RatingCompat
 import android.support.v4.media.session.MediaSessionCompat
 import android.support.v4.media.session.PlaybackStateCompat
+import android.view.KeyEvent
+import android.view.KeyEvent.KEYCODE_MEDIA_STOP
 import androidx.annotation.MainThread
 import androidx.core.app.NotificationCompat
 import androidx.media.MediaBrowserServiceCompat
+import androidx.media.session.MediaButtonReceiver
 import androidx.media.utils.MediaConstants
 import com.facebook.react.ReactHost
 import com.facebook.react.ReactInstanceEventListener
@@ -668,8 +671,34 @@ class MusicService : HeadlessJsMediaService() {
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        if (intent == null) {
+            return START_NOT_STICKY
+        }
+
+        if (Intent.ACTION_MEDIA_BUTTON == intent.action) {
+            @Suppress("DEPRECATION")
+            val intentExtra: KeyEvent? = intent.getParcelableExtra(Intent.EXTRA_KEY_EVENT)
+            if (intentExtra!!.keyCode == KEYCODE_MEDIA_STOP) {
+                intentToStop = true
+                startServiceOreoAndAbove()
+                stopSelf()
+            } else {
+                intentToStop = false
+            }
+
+            if (manager != null) {
+                MediaButtonReceiver.handleIntent(manager!!.metadata.session, intent)
+                return START_NOT_STICKY
+            }
+        }
+
+        if (manager == null) manager = MusicManager(this)
+
+        @Suppress("DEPRECATION")
+        if (handler == null) handler = Handler()
+
         startTask(getTaskConfig(intent))
-        if (intent != null) startAndStopEmptyNotificationToAvoidANR()
+        startAndStopEmptyNotificationToAvoidANR()
         return START_STICKY
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@javascriptcommon/react-native-track-player",
-  "version": "1.2.25",
+  "version": "1.2.26",
   "description": "A fully fledged audio module created for music apps",
   "contributors": [
     {