kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-13 22:00:30 +05:30
Code Issues Projects Releases Wiki Activity

fix: Handle PendingIntentCompat changes

Browse Source
This commit is contained in:
Isira Seneviratne 2023-09-07 19:28:52 +05:30
parent 43ecdd3aac
commit d808a48529
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt
View File

@ -346,7 +346,7 @@ object PlayerHelper {
private fun getPendingIntent(activity: Activity, event: PlayerEvent): PendingIntent {
val intent = Intent(getIntentAction(activity)).putExtra(CONTROL_TYPE, event)
return PendingIntentCompat.getBroadcast(activity, event.ordinal, intent, 0, false)
return PendingIntentCompat.getBroadcast(activity, event.ordinal, intent, 0, false)!!
}
private fun getRemoteAction(

18
app/src/main/java/com/github/libretube/util/NowPlayingNotification.kt
View File

@ -2,7 +2,6 @@ package com.github.libretube.util
import android.app.NotificationManager
import android.app.PendingIntent
import android.app.PendingIntent.FLAG_UPDATE_CURRENT
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
@ -74,7 +73,7 @@ class NowPlayingNotification(
}
}
private fun createCurrentContentIntent(): PendingIntent {
private fun createCurrentContentIntent(): PendingIntent? {
// starts a new MainActivity Intent when the player notification is clicked
// it doesn't start a completely new MainActivity because the MainActivity's launchMode
// is set to "singleTop" in the AndroidManifest (important!!!)
@ -85,11 +84,12 @@ class NowPlayingNotification(
addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
}
}
return PendingIntentCompat.getActivity(context, 0, intent, FLAG_UPDATE_CURRENT, false)
return PendingIntentCompat
.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT, false)
}
private fun createDeleteIntent(): PendingIntent {
val intent = Intent(STOP).setPackage(context.packageName)
private fun createIntent(action: String): PendingIntent? {
val intent = Intent(action).setPackage(context.packageName)
return PendingIntentCompat
.getBroadcast(context, 1, intent, PendingIntent.FLAG_CANCEL_CURRENT, false)
}
@ -141,10 +141,8 @@ class NowPlayingNotification(
drawableRes: Int,
actionName: String
): NotificationCompat.Action {
val intent = Intent(actionName).setPackage(context.packageName)
val pendingIntent = PendingIntentCompat
.getBroadcast(context, 1, intent, PendingIntent.FLAG_CANCEL_CURRENT, false)
return NotificationCompat.Action.Builder(drawableRes, actionName, pendingIntent).build()
return NotificationCompat.Action.Builder(drawableRes, actionName, createIntent(actionName))
.build()
}
private fun createMediaSessionAction(
@ -351,7 +349,7 @@ class NowPlayingNotification(
notificationBuilder = NotificationCompat.Builder(context, PLAYER_CHANNEL_ID)
.setSmallIcon(R.drawable.ic_launcher_lockscreen)
.setContentIntent(createCurrentContentIntent())
.setDeleteIntent(createDeleteIntent())
.setDeleteIntent(createIntent(STOP))
.setStyle(
MediaStyle()
.setMediaSession(mediaSession.sessionToken)