Skip to content
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.

Sign up for GitHub

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

Improve notification handling #1037

Merged
merged 2 commits into from
May 5, 2023
Merged

Improve notification handling #1037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7419be8
Fix notification deletion not stopping playback
Maxr1998 May 1, 2023
510990c
Cleanup player notification handling
Maxr1998 May 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions app/src/main/java/org/jellyfin/mobile/player/interaction/PlayerNotificationAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package org.jellyfin.mobile.player.interaction

import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import org.jellyfin.mobile.R
import org.jellyfin.mobile.utils.Constants

enum class PlayerNotificationAction(
val action: String,
@DrawableRes val icon: Int,
@StringRes val label: Int,
) {
PLAY(
Constants.ACTION_PLAY,
R.drawable.ic_play_black_42dp,
R.string.notification_action_play,
),
PAUSE(
Constants.ACTION_PAUSE,
R.drawable.ic_pause_black_42dp,
R.string.notification_action_pause,
),
REWIND(
Constants.ACTION_REWIND,
R.drawable.ic_rewind_black_32dp,
R.string.notification_action_rewind,
),
FAST_FORWARD(
Constants.ACTION_FAST_FORWARD,
R.drawable.ic_fast_forward_black_32dp,
R.string.notification_action_fast_forward,
),
PREVIOUS(
Constants.ACTION_PREVIOUS,
R.drawable.ic_skip_previous_black_32dp,
R.string.notification_action_previous,
),
NEXT(
Constants.ACTION_NEXT,
R.drawable.ic_skip_next_black_32dp,
R.string.notification_action_next,
),
STOP(
Constants.ACTION_STOP,
0,
R.string.notification_action_stop,
),
}
136 changes: 52 additions & 84 deletions app/src/main/java/org/jellyfin/mobile/player/interaction/PlayerNotificationHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import android.content.Intent
import android.content.IntentFilter
import android.graphics.Bitmap
import android.os.Build
import androidx.annotation.StringRes
import androidx.core.content.getSystemService
import androidx.core.graphics.drawable.toBitmap
import androidx.lifecycle.viewModelScope
Expand All @@ -25,6 +24,7 @@ import org.jellyfin.mobile.MainActivity
import org.jellyfin.mobile.R
import org.jellyfin.mobile.app.AppPreferences
import org.jellyfin.mobile.player.PlayerViewModel
import org.jellyfin.mobile.player.source.JellyfinMediaSource
import org.jellyfin.mobile.utils.Constants
import org.jellyfin.mobile.utils.Constants.VIDEO_PLAYER_NOTIFICATION_ID
import org.jellyfin.mobile.utils.createMediaNotificationChannel
Expand All @@ -48,7 +48,21 @@ class PlayerNotificationHelper(private val viewModel: PlayerViewModel) : KoinCom
val allowBackgroundAudio: Boolean
get() = appPreferences.exoPlayerAllowBackgroundAudio

@Suppress("DEPRECATION", "LongMethod")
private val notificationActionReceiver: BroadcastReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
when (intent.action) {
Constants.ACTION_PLAY -> viewModel.play()
Constants.ACTION_PAUSE -> viewModel.pause()
Constants.ACTION_REWIND -> viewModel.rewind()
Constants.ACTION_FAST_FORWARD -> viewModel.fastForward()
Constants.ACTION_PREVIOUS -> viewModel.skipToPrevious()
Constants.ACTION_NEXT -> viewModel.skipToNext()
Constants.ACTION_STOP -> viewModel.stop()
}
}
}

@Suppress("DEPRECATION")
fun postNotification() {
val nm = notificationManager ?: return
val player = viewModel.playerOrNull ?: return
Expand All @@ -62,15 +76,7 @@ class PlayerNotificationHelper(private val viewModel: PlayerViewModel) : KoinCom

viewModel.viewModelScope.launch {
val mediaIcon: Bitmap? = withContext(Dispatchers.IO) {
val size = context.resources.getDimensionPixelSize(R.dimen.media_notification_height)

val imageUrl = imageApi.getItemImageUrl(
itemId = mediaSource.itemId,
imageType = ImageType.PRIMARY,
maxWidth = size,
maxHeight = size,
)
imageLoader.execute(ImageRequest.Builder(context).data(imageUrl).build()).drawable?.toBitmap()
loadImage(mediaSource)
}

val style = Notification.MediaStyle().apply {
Expand All @@ -91,52 +97,18 @@ class PlayerNotificationHelper(private val viewModel: PlayerViewModel) : KoinCom
mediaSource.item?.artists?.joinToString()?.let(::setContentText)
setStyle(style)
setVisibility(Notification.VISIBILITY_PUBLIC)
if (queueItem.hasPrevious()) {
addAction(
generateAction(
R.drawable.ic_skip_previous_black_32dp,
R.string.notification_action_previous,
Constants.ACTION_PREVIOUS,
),
)
} else {
addAction(
generateAction(
R.drawable.ic_rewind_black_32dp,
R.string.notification_action_rewind,
Constants.ACTION_REWIND,
),
)
when {
queueItem.hasPrevious() -> addAction(generateAction(PlayerNotificationAction.PREVIOUS))
else -> addAction(generateAction(PlayerNotificationAction.REWIND))
}
val playbackAction = when {
!player.playWhenReady -> generateAction(
R.drawable.ic_play_black_42dp,
R.string.notification_action_play,
Constants.ACTION_PLAY,
)
else -> generateAction(
R.drawable.ic_pause_black_42dp,
R.string.notification_action_pause,
Constants.ACTION_PAUSE,
)
!player.playWhenReady -> PlayerNotificationAction.PLAY
else -> PlayerNotificationAction.PAUSE
}
addAction(playbackAction)
if (queueItem.hasNext()) {
addAction(
generateAction(
R.drawable.ic_skip_next_black_32dp,
R.string.notification_action_next,
Constants.ACTION_NEXT,
),
)
} else {
addAction(
generateAction(
R.drawable.ic_fast_forward_black_32dp,
R.string.notification_action_fast_forward,
Constants.ACTION_FAST_FORWARD,
),
)
addAction(generateAction(playbackAction))
when {
queueItem.hasNext() -> addAction(generateAction(PlayerNotificationAction.NEXT))
else -> addAction(generateAction(PlayerNotificationAction.FAST_FORWARD))
}
setContentIntent(buildContentIntent())
setDeleteIntent(buildDeleteIntent())
Expand All @@ -146,18 +118,11 @@ class PlayerNotificationHelper(private val viewModel: PlayerViewModel) : KoinCom
}

if (receiverRegistered.compareAndSet(false, true)) {
context.registerReceiver(
notificationActionReceiver,
IntentFilter().apply {
addAction(Constants.ACTION_PLAY)
addAction(Constants.ACTION_PAUSE)
addAction(Constants.ACTION_REWIND)
addAction(Constants.ACTION_FAST_FORWARD)
addAction(Constants.ACTION_PREVIOUS)
addAction(Constants.ACTION_NEXT)
addAction(Constants.ACTION_STOP)
},
)
val filter = IntentFilter()
for (notificationAction in PlayerNotificationAction.values()) {
filter.addAction(notificationAction.action)
}
context.registerReceiver(notificationActionReceiver, filter)
}
}

Expand All @@ -168,13 +133,30 @@ class PlayerNotificationHelper(private val viewModel: PlayerViewModel) : KoinCom
}
}

private fun generateAction(icon: Int, @StringRes title: Int, intentAction: String): Notification.Action {
val intent = Intent(intentAction).apply {
private suspend fun loadImage(mediaSource: JellyfinMediaSource): Bitmap? {
val size = context.resources.getDimensionPixelSize(R.dimen.media_notification_height)

val imageUrl = imageApi.getItemImageUrl(
itemId = mediaSource.itemId,
imageType = ImageType.PRIMARY,
maxWidth = size,
maxHeight = size,
)
val imageRequest = ImageRequest.Builder(context).data(imageUrl).build()
return imageLoader.execute(imageRequest).drawable?.toBitmap()
}

private fun generateAction(playerNotificationAction: PlayerNotificationAction): Notification.Action {
val intent = Intent(playerNotificationAction.action).apply {
`package` = BuildConfig.APPLICATION_ID
}
val pendingIntent = PendingIntent.getBroadcast(context, 0, intent, Constants.PENDING_INTENT_FLAGS)
@Suppress("DEPRECATION")
return Notification.Action.Builder(icon, context.getString(title), pendingIntent).build()
return Notification.Action.Builder(
playerNotificationAction.icon,
context.getString(playerNotificationAction.label),
pendingIntent,
).build()
}

private fun buildContentIntent(): PendingIntent {
Expand All @@ -185,23 +167,9 @@ class PlayerNotificationHelper(private val viewModel: PlayerViewModel) : KoinCom
}

private fun buildDeleteIntent(): PendingIntent {
val intent = Intent(Constants.ACTION_PAUSE).apply {
val intent = Intent(Constants.ACTION_STOP).apply {
`package` = BuildConfig.APPLICATION_ID
}
return PendingIntent.getBroadcast(context, 0, intent, Constants.PENDING_INTENT_FLAGS)
}

private val notificationActionReceiver: BroadcastReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
when (intent.action) {
Constants.ACTION_PLAY -> viewModel.play()
Constants.ACTION_PAUSE -> viewModel.pause()
Constants.ACTION_REWIND -> viewModel.rewind()
Constants.ACTION_FAST_FORWARD -> viewModel.fastForward()
Constants.ACTION_PREVIOUS -> viewModel.skipToPrevious()
Constants.ACTION_NEXT -> viewModel.skipToNext()
Constants.ACTION_STOP -> viewModel.stop()
}
}
}
}