Audio Refactor #1890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

ThomasSession wants to merge 37 commits into dev from experiment/audio-playback

app/build.gradle.kts

-Original file line number
+Diff line change
@@ Expand Up / @@ -385,6 +385,11 @@ dependencies { @@
         implementation(libs.androidx.media3.exoplayer)
         implementation(libs.androidx.media3.ui)
+        implementation(libs.androidx.media3.session)
+        implementation(libs.androidx.media3.common.ktx)
+        implementation(libs.androidx.media3.ui.compose)
+        implementation(libs.androidx.media3.ui.compose.material3)
         implementation(libs.conscrypt.android)
         implementation(libs.android)
         implementation(libs.photoview)
@@ Expand Down @@

app/src/main/AndroidManifest.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -40,6 +40,7 @@ @@
         <uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL"/>
         <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE"/>
         <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>
+        <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
         <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
         <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
@@ Expand Down Expand Up / @@ -334,6 +335,17 @@ @@
                 android:name="org.thoughtcrime.securesms.service.CallForegroundService"
                 android:foregroundServiceType="phoneCall|microphone"
                 android:exported="false" />
+            <service
+                android:name="org.thoughtcrime.securesms.audio.AudioMediaService"
+                android:exported="false"
+                android:foregroundServiceType="mediaPlayback">
+                <intent-filter>
+                    <action android:name="androidx.media3.session.MediaSessionService" />
+                    <action android:name="android.media.browse.MediaBrowserService" />
+                </intent-filter>
+            </service>
             <receiver
                 android:name="org.thoughtcrime.securesms.notifications.MarkReadReceiver"
@@ Expand Down @@

app/src/main/java/org/thoughtcrime/securesms/audio/AudioMediaService.kt

-Original file line number
+Diff line change
@@ -0,0 +1,212 @@
+    package org.thoughtcrime.securesms.audio
+    import android.app.PendingIntent
+    import android.content.Intent
+    import android.os.Bundle
+    import androidx.annotation.OptIn
+    import androidx.media3.common.AudioAttributes
+    import androidx.media3.common.C
+    import androidx.media3.common.MediaItem
+    import androidx.media3.common.Player
+    import androidx.media3.common.util.UnstableApi
+    import androidx.media3.exoplayer.ExoPlayer
+    import androidx.media3.session.DefaultMediaNotificationProvider
+    import androidx.media3.session.MediaSession
+    import androidx.media3.session.MediaSessionService
+    import androidx.media3.session.SessionCommand
+    import androidx.media3.session.SessionError
+    import androidx.media3.session.SessionResult
+    import com.google.common.util.concurrent.Futures
+    import com.google.common.util.concurrent.ListenableFuture
+    import dagger.hilt.android.AndroidEntryPoint
+    import network.loki.messenger.R
+    import org.session.libsession.utilities.Address
+    import org.session.libsignal.utilities.Log
+    import org.thoughtcrime.securesms.audio.model.AudioCommands
+    import org.thoughtcrime.securesms.audio.model.MediaItemFactory
+    import org.thoughtcrime.securesms.audio.model.MediaItemFactory.EXTRA_MESSAGE_ID
+    import org.thoughtcrime.securesms.audio.model.MediaItemFactory.EXTRA_THREAD_ADDRESS
+    import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
+    import org.thoughtcrime.securesms.database.model.MessageId
+    import org.thoughtcrime.securesms.util.getParcelableCompat
+    @AndroidEntryPoint
+    class AudioMediaService : MediaSessionService() {
+        private val TAG = "AudioMediaService"
+        private lateinit var player: ExoPlayer
+        private var session: MediaSession? = null
+        @OptIn(UnstableApi::class)
+        override fun onCreate() {
+            super.onCreate()
+            // Media-style notification + lockscreen controls handled by MediaSessionService.
+            val notificationProvider = DefaultMediaNotificationProvider.Builder(this)
+                .build()
+            notificationProvider.setSmallIcon(R.drawable.ic_notification)
+            setMediaNotificationProvider(
+                notificationProvider
+            )
+            player = ExoPlayer.Builder(this).build().apply {
+                addListener(servicePlayerListener)
+            }
+            session = MediaSession.Builder(this, player)
+                .setCallback(SessionCallback())
+                .build()
+            updateSessionActivityFromCurrentItem()
+            // Apply policy for the initial item if any controller sets it very quickly.
+            applyAudioPolicyForCurrentItem()
+        }
+        @OptIn(UnstableApi::class)
+        private fun updateSessionActivityFromCurrentItem() {
+            val item = player.currentMediaItem ?: return
+            val extras = item.mediaMetadata.extras ?: return
+            val thread = extras.getParcelableCompat<Address.Conversable>(EXTRA_THREAD_ADDRESS) ?: return
+            val messageId = extras.getParcelableCompat<MessageId>(
+                EXTRA_MESSAGE_ID
+            ) ?: return
+            val intent = ConversationActivityV2.createIntent(
+                context = applicationContext,
+                address = thread,
+                scrollToMessage = messageId
+            ).apply {
+                // good defaults for "return to existing convo if open"
+                flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
+            }
+            val requestCode = item.mediaId.hashCode()
+            val pi = PendingIntent.getActivity(
+                applicationContext,
+                requestCode,
+                intent,
+                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+            )
+            session?.setSessionActivity(pi)
+        }
+        override fun onGetSession(controllerInfo: MediaSession.ControllerInfo): MediaSession? = session
+        override fun onDestroy() {
+            session?.release()
+            session = null
+            player.removeListener(servicePlayerListener)
+            player.release()
+            super.onDestroy()
+        }
+        override fun onTaskRemoved(rootIntent: Intent?) {
+            if (player.isPlaying) {
+                player.stop()
+            }
+            stopSelf()
+        }
+        // Player policy (voice vs music)
+        private fun applyAudioPolicyForCurrentItem() {
+            val isVoice = MediaItemFactory.isVoice(player.currentMediaItem)
+            val attrs = AudioAttributes.Builder()
+                .setContentType(if (isVoice) C.AUDIO_CONTENT_TYPE_SPEECH else C.AUDIO_CONTENT_TYPE_MUSIC)
+                .setUsage(C.USAGE_MEDIA)
+                .build()
+            player.setAudioAttributes(attrs, /* handleAudioFocus = */ true)
+        }
+        private val servicePlayerListener = object : Player.Listener {
+            override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) {
+                applyAudioPolicyForCurrentItem()
+                updateSessionActivityFromCurrentItem()
+            }
+            override fun onPlaybackStateChanged(playbackState: Int) {
+                // stop service once track has ended
+                if (playbackState == Player.STATE_ENDED) {
+                    stopSelf()
+                    return
+                }
+                // If nothing queued, stop service
+                if (playbackState == Player.STATE_IDLE && player.mediaItemCount == 0) {
+                    stopSelf()
+                }
+            }
+        }
+        // MediaSession callback
+        private inner class SessionCallback : MediaSession.Callback {
+            @OptIn(UnstableApi::class)
+            override fun onConnect(
+                session: MediaSession,
+                controller: MediaSession.ControllerInfo
+            ): MediaSession.ConnectionResult {
+                val base = super.onConnect(session, controller)
+                // Tighten commands for the system notification controller (no next/previous).
+                if (session.isMediaNotificationController(controller)) {
+                    val playerCommands = base.availablePlayerCommands
+                        .buildUpon()
+                        .remove(Player.COMMAND_SEEK_TO_NEXT_MEDIA_ITEM)
+                        .build()
+                    val sessionCommands = base.availableSessionCommands
+                        .buildUpon()
+                        .add(AudioCommands.ScrubStart)
+                        .add(AudioCommands.ScrubStop)
+                        .build()
+                    return MediaSession.ConnectionResult.accept(sessionCommands, playerCommands)
+                }
+                // In-app UI controller: allow scrubbing commands too.
+                return MediaSession.ConnectionResult.accept(
+                    base.availableSessionCommands.buildUpon()
+                        .add(AudioCommands.ScrubStart)
+                        .add(AudioCommands.ScrubStop)
+                        .build(),
+                    base.availablePlayerCommands
+                )
+            }
+            @OptIn(UnstableApi::class)
+            override fun onCustomCommand(
+                session: MediaSession,
+                controller: MediaSession.ControllerInfo,
+                customCommand: SessionCommand,
+                args: Bundle
+            ): ListenableFuture<SessionResult> {
+                return when {
+                    AudioCommands.isScrubStart(customCommand) -> {
+                        player.isScrubbingModeEnabled = true
+                        Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS))
+                    }
+                    AudioCommands.isScrubStop(customCommand) -> {
+                        player.isScrubbingModeEnabled = false
+                        Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS))
+                    }
+                    else -> {
+                        Log.w(TAG, "Unsupported custom command: ${customCommand.customAction}")
+                        Futures.immediateFuture(SessionResult(SessionError.ERROR_NOT_SUPPORTED))
+                    }
+                }
+            }
+        }
+    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Audio Refactor #1890

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Audio Refactor #1890

Are you sure you want to change the base?

Uh oh!

Audio Refactor #1890

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!