- Set Wake mode flag according to Offline status

- Use Rx to trigger CheckDownloads()
- Fix #680 by listening to PositionDiscontinuity
- Throttle RxEvents

ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/PlaybackService.kt

@@ -35,6 +35,7 @@ import org.koin.core.component.inject
 import org.moire.ultrasonic.activity.NavigationActivity
 import org.moire.ultrasonic.api.subsonic.SubsonicAPIClient
 import org.moire.ultrasonic.app.UApp
+import org.moire.ultrasonic.data.ActiveServerProvider
 import org.moire.ultrasonic.service.RxBus
 import org.moire.ultrasonic.service.plusAssign
 import org.moire.ultrasonic.util.Constants
@@ -74,9 +75,16 @@ class PlaybackService : MediaLibraryService(), KoinComponent {
             // Update the API endpoint when the active server has changed
             val newClient: SubsonicAPIClient by inject()
             apiDataSource.setAPIClient(newClient)
+
+            // Set the player wake mode
+            player.setWakeMode(getWakeModeFlag())
         }
     }
 
+    private fun getWakeModeFlag(): Int {
+        return if (ActiveServerProvider.isOffline()) C.WAKE_MODE_LOCAL else C.WAKE_MODE_NETWORK
+    }
+
     override fun onDestroy() {
         player.release()
         mediaLibrarySession.release()
@@ -90,10 +98,6 @@ class PlaybackService : MediaLibraryService(), KoinComponent {
 
     @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
     private fun initializeSessionAndPlayer() {
-        /*
-        * TODO:
-        *  * Could be refined to use WAKE_MODE_LOCAL when offline....
-        */
 
         setMediaNotificationProvider(MediaNotificationProvider(UApp.applicationContext()))
 
@@ -112,7 +116,7 @@ class PlaybackService : MediaLibraryService(), KoinComponent {
         // Create the player
         player = ExoPlayer.Builder(this)
             .setAudioAttributes(getAudioAttributes(), true)
-            .setWakeMode(C.WAKE_MODE_NETWORK)
+            .setWakeMode(getWakeModeFlag())
             .setHandleAudioBecomingNoisy(true)
             .setMediaSourceFactory(DefaultMediaSourceFactory(cacheDataSourceFactory))
             .setRenderersFactory(renderer)

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadService.kt

@@ -56,7 +56,7 @@ class DownloadService : Service() {
         updateNotification()
 
         instance = this
-        Timber.i("DownloadService created")
+        Timber.i("DownloadService initiated")
     }
 
     override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
@@ -74,10 +74,11 @@ class DownloadService : Service() {
             mediaSession = null
         } catch (ignored: Throwable) {
         }
-        Timber.i("DownloadService stopped")
+        Timber.i("DownloadService destroyed")
     }
 
     fun notifyDownloaderStopped() {
+        Timber.i("DownloadService stopped")
         isInForeground = false
         stopForeground(true)
         stopSelf()
@@ -193,6 +194,7 @@ class DownloadService : Service() {
                     } else {
                         context.startService(Intent(context, DownloadService::class.java))
                     }
+                    Timber.i("DownloadService started")
                 }
                 Util.sleepQuietly(100L)
             }

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/Downloader.kt

@@ -64,6 +64,13 @@ class Downloader(
 
     private val rxBusSubscription: CompositeDisposable = CompositeDisposable()
 
+    init {
+        // Check downloads if the playlist changed
+        rxBusSubscription += RxBus.playlistObservable.subscribe {
+            checkDownloads()
+        }
+    }
+
     private var downloadChecker = object : Runnable {
         override fun run() {
             try {
@@ -100,11 +107,6 @@ class Downloader(
             wifiLock = Util.createWifiLock(toString())
             wifiLock?.acquire()
         }
-
-        // Check downloads if the playlist changed
-        rxBusSubscription += RxBus.playlistObservable.subscribe {
-            checkDownloads()
-        }
     }
 
     fun stop() {
@@ -133,7 +135,7 @@ class Downloader(
 
     @Suppress("ComplexMethod", "ComplexCondition")
     @Synchronized
-    fun checkDownloadsInternal() {
+    private fun checkDownloadsInternal() {
         if (!Util.isExternalStoragePresent() || !storageMonitor.isExternalStorageAvailable) {
             return
         }

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerController.kt

@@ -115,6 +115,20 @@ class MediaPlayerController(
                     legacyPlaylistManager.updateCurrentPlaying(mediaItem)
                     publishPlaybackState()
                 }
+
+                /*
+                 * If the same item is contained in a playlist multiple times directly after each
+                 * other, Media3 on emits a PositionDiscontinuity event.
+                 * Can be removed if https://github.com/androidx/media/issues/68 is fixed.
+                 */
+                override fun onPositionDiscontinuity(
+                    oldPosition: Player.PositionInfo,
+                    newPosition: Player.PositionInfo,
+                    reason: Int
+                ) {
+                    playerStateChangedHandler()
+                    publishPlaybackState()
+                }
             })
 
             onCreated()
@@ -149,9 +163,7 @@ class MediaPlayerController(
         }
 
         // Save playback state
-        playbackStateSerializer.serialize(
+        serializeCurrentSession()
-            playList, currentMediaItemIndex, playerPosition
-        )
 
         // Update widget
         if (currentPlaying != null) {
@@ -347,8 +359,6 @@ class MediaPlayerController(
 
         if (autoPlay) {
             play(0)
-        } else {
-            downloader.checkDownloads()
         }
     }
 

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RxBus.kt

@@ -5,6 +5,7 @@ import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.disposables.Disposable
 import io.reactivex.rxjava3.subjects.PublishSubject
+import java.util.concurrent.TimeUnit
 
 class RxBus {
     companion object {
@@ -37,6 +38,7 @@ class RxBus {
             playlistPublisher.observeOn(AndroidSchedulers.mainThread())
                 .replay(1)
                 .autoConnect(0)
+                .throttleLatest(1, TimeUnit.SECONDS)
 
         // Commands
         val dismissNowPlayingCommandPublisher: PublishSubject<Unit> =