migrate to patched notif api for now

Author: nift4

app/src/main/java/androidx/media3/session/ext.kt

@@ -75,7 +75,6 @@ import androidx.media3.session.MediaSessionService
 import androidx.media3.session.SessionCommand
 import androidx.media3.session.SessionError
 import androidx.media3.session.SessionResult
-import androidx.media3.session.doUpdateNotification
 import androidx.preference.PreferenceManager
 import coil3.BitmapImage
 import coil3.imageLoader
@@ -972,7 +971,7 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
         else null
         if (lastSentHighlightedLyric != highlightedLyric) {
             lastSentHighlightedLyric = highlightedLyric
-            doUpdateNotification(mediaSession!!)
+            manuallyUpdateMediaNotification(mediaSession!!)
         }
     }
 

app/src/main/java/org/akanework/gramophone/logic/GramophonePlaybackService.kt

@@ -1,6 +1,6 @@
 package org.akanework.gramophone.logic.ui
 
-import android.content.Context
+import android.app.Notification
 import android.os.Bundle
 import androidx.annotation.OptIn
 import androidx.core.app.NotificationCompat
@@ -10,25 +10,29 @@ import androidx.media3.session.DefaultMediaNotificationProvider
 import androidx.media3.session.MediaNotification
 import androidx.media3.session.MediaSession
 import androidx.media3.session.MediaSessionService
-import androidx.media3.session.isManualNotificationUpdate
 import com.google.common.collect.ImmutableList
 import org.akanework.gramophone.R
 
 private const val FLAG_ALWAYS_SHOW_TICKER = 0x01000000
 private const val FLAG_ONLY_UPDATE_TICKER = 0x02000000
 
 @OptIn(UnstableApi::class)
-private class InnerMeiZuLyricsMediaNotificationProvider(
-    context: Context,
+class MeiZuLyricsMediaNotificationProvider(
+    context: MediaSessionService,
     private val tickerProvider: () -> CharSequence?
 ) : DefaultMediaNotificationProvider(context) {
+    private var ticker: CharSequence? = null
+    init {
+        setSmallIcon(R.drawable.ic_gramophone_monochrome)
+    }
+
     override fun addNotificationActions(
         mediaSession: MediaSession,
         mediaButtons: ImmutableList<CommandButton>,
         builder: NotificationCompat.Builder,
         actionFactory: MediaNotification.ActionFactory
     ): IntArray {
-        val ticker = tickerProvider()
+        ticker = tickerProvider()
         builder.setTicker(ticker)
         if (ticker != null) {
             builder.addExtras(Bundle().apply {
@@ -39,52 +43,25 @@ private class InnerMeiZuLyricsMediaNotificationProvider(
         }
         return super.addNotificationActions(mediaSession, mediaButtons, builder, actionFactory)
     }
-}
 
-@OptIn(UnstableApi::class)
-class MeiZuLyricsMediaNotificationProvider(
-    context: MediaSessionService,
-    private val tickerProvider: () -> CharSequence?
-) : MediaNotification.Provider {
-    private val inner = InnerMeiZuLyricsMediaNotificationProvider(context, tickerProvider).apply {
-        setSmallIcon(R.drawable.ic_gramophone_monochrome)
-    }
-
-    override fun createNotification(
-        mediaSession: MediaSession,
-        customLayout: ImmutableList<CommandButton>,
-        actionFactory: MediaNotification.ActionFactory,
-        onNotificationChangedCallback: MediaNotification.Provider.Callback
+    override fun createMediaNotification(
+        notificationId: Int,
+        notification: Notification,
+        reason: @MediaSessionService.NotificationUpdate Int,
+        isRebuild: Boolean
     ): MediaNotification {
-        val ticker = tickerProvider()
-        return inner.createNotification(
-            mediaSession, customLayout, actionFactory
-        ) {
-            onNotificationChangedCallback.onNotificationChanged(it.also {
+        val notification = super.createMediaNotification(notificationId, notification, reason, isRebuild)
+        val isManual = !isRebuild && reason == MediaSessionService.NOTIFICATION_UPDATE_MANUAL
+        if (ticker != null || isManual)
+            notification.notification.apply {
+                // Keep the status bar lyrics scrolling
                 if (ticker != null)
-                    it.applyNotificationFlags(true, false)
-            })
-        }.also {
-            if (ticker != null || isManualNotificationUpdate)
-                it.applyNotificationFlags(ticker != null, isManualNotificationUpdate)
-        }
-    }
-
-    override fun handleCustomCommand(
-        session: MediaSession,
-        action: String,
-        extras: Bundle
-    ) = inner.handleCustomCommand(session, action, extras)
-
-    private fun MediaNotification.applyNotificationFlags(alwaysShowTicker: Boolean, onlyUpdateTicker: Boolean) {
-        notification.apply {
-            // Keep the status bar lyrics scrolling
-            if (alwaysShowTicker)
-                flags = flags.or(FLAG_ALWAYS_SHOW_TICKER)
-            // Only update the ticker (lyrics), and do not update other properties
-            if (onlyUpdateTicker)
-                flags = flags.or(FLAG_ONLY_UPDATE_TICKER)
-        }
+                    flags = flags.or(FLAG_ALWAYS_SHOW_TICKER)
+                // Only update the ticker (lyrics), and do not update other properties
+                if (isManual)
+                    flags = flags.or(FLAG_ONLY_UPDATE_TICKER)
+            }
+        return notification
     }
 
 }