@javascriptcommon/react-native-track-player 1.2.23 → 1.2.24

package/android/src/main/java/com/guichaguri/trackplayer/HeadlessJsMediaService.java

@@ -111,7 +111,7 @@ public abstract class HeadlessJsMediaService extends MediaBrowserServiceCompat i
      */
     protected void startTask(final HeadlessJsTaskConfig taskConfig) {
         UiThreadUtil.assertOnUiThread();
-        // acquireWakeLockNow(this);
+        acquireWakeLockNow(this);
         ReactContext reactContext = getReactContext();
         if (reactContext == null) {
             createReactContextAndScheduleTask(taskConfig);

package/android/src/main/java/com/guichaguri/trackplayer/module/MusicModule.kt

@@ -611,13 +611,28 @@ class MusicModule(reactContext: ReactApplicationContext?) :
                 IntentFilter(EVENT_INTENT)
             )
 
-            Intent(reactApplicationContext, MusicService::class.java).also { intent ->
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    reactApplicationContext.startForegroundService(intent)
-                } else {
-                    reactApplicationContext.startService(intent)
+            val musicModule = this
+            scope.launch {
+                var retries = 0
+                while (true) {
+                    try {
+                        Intent(reactApplicationContext, MusicService::class.java).also { intent ->
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                                reactApplicationContext.startForegroundService(intent)
+                            } else {
+                                reactApplicationContext.startService(intent)
+                            }
+                            reactApplicationContext.bindService(intent, musicModule, Context.BIND_AUTO_CREATE)
+                        }
+                        break
+                    } catch (exception: Exception) {
+                        retries += 1
+                        if (retries > 10) {
+                            throw exception
+                        }
+                        delay(500)
+                    }
                 }
-                reactApplicationContext.bindService(intent, this, Context.BIND_AUTO_CREATE)
             }
         } catch (_: Exception) {}
     }

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

@@ -173,12 +173,12 @@ class MusicService : HeadlessJsMediaService() {
                 // Sets the service to foreground with an empty notification
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                     startForeground(
-                        1,
+                        EMPTY_NOTIFICATION_ID,
                         NotificationCompat.Builder(this, channel).build(),
                         ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK
                     )
                 } else {
-                    startForeground(1, NotificationCompat.Builder(this, channel).build())
+                    startForeground(EMPTY_NOTIFICATION_ID, NotificationCompat.Builder(this, channel).build())
                 }
                 // Stops the service right after
                 stopSelf()
@@ -646,12 +646,12 @@ class MusicService : HeadlessJsMediaService() {
         try {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                 startForeground(
-                    1,
+                    EMPTY_NOTIFICATION_ID,
                     NotificationCompat.Builder(this, channel).build(),
                     ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK
                 )
             } else {
-                startForeground(1, NotificationCompat.Builder(this, channel).build())
+                startForeground(EMPTY_NOTIFICATION_ID, NotificationCompat.Builder(this, channel).build())
             }
         } catch (_: Exception) { }
     }
@@ -683,9 +683,17 @@ class MusicService : HeadlessJsMediaService() {
             notificationBuilder.setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
         }
         val notification = notificationBuilder.build()
-        startForeground(1, notification)
-        @Suppress("DEPRECATION")
-        stopForeground(true)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            startForeground(EMPTY_NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK)
+        } else {
+            startForeground(EMPTY_NOTIFICATION_ID, notification)
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            stopForeground(STOP_FOREGROUND_REMOVE)
+        } else {
+            @Suppress("DEPRECATION")
+            stopForeground(true)
+        }
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
@@ -750,9 +758,9 @@ class MusicService : HeadlessJsMediaService() {
                     NotificationCompat.PRIORITY_MIN
                 ).build()
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                startForeground(1, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK)
+                startForeground(EMPTY_NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK)
             } else {
-                startForeground(1, notification)
+                startForeground(EMPTY_NOTIFICATION_ID, notification)
             }
         }
     }
@@ -1185,6 +1193,9 @@ class MusicService : HeadlessJsMediaService() {
                         notification = it.notification;
                         if (it.ongoing) {
                             if (player?.playWhenReady == true) {
+                                if (sWakeLock?.isHeld != true) {
+                                    sWakeLock?.acquire()
+                                }
                                 startForegroundIfNecessary()
                             }
                         } else if (shouldStopForeground()) {
@@ -1194,7 +1205,10 @@ class MusicService : HeadlessJsMediaService() {
                             // user's queue is complete. This prevents the service from potentially
                             // being immediately destroyed once the player finishes playing media.
                             scope.launch {
-                                delay(stopForegroundGracePeriod.toLong() * 1000)
+                                if (sWakeLock?.isHeld == true) {
+                                    sWakeLock?.release()
+                                }
+                                // delay(stopForegroundGracePeriod.toLong() * 1000)
                                 // if (shouldStopForeground()) {
                                 // @Suppress("DEPRECATION")
                                 // stopForeground(removeNotificationWhenNotOngoing)

package/package.json

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