Commit 4f743d70 authored by MozLando's avatar MozLando
Browse files

Merge #7152 



7152: Closes #7150: Media notification: Set flag to replace existing pending intent. r=rocketsroger a=pocmo



Co-authored-by: default avatarSebastian Kaspari <s.kaspari@gmail.com>
parents 11e259c2 e2aedcd7

components/feature/media/src/main/java/mozilla/components/feature/media/notification/MediaNotification.kt

+10 −4
Original line number Diff line number Diff line
@@ -93,9 +93,12 @@ private fun BrowserState.toNotificationData( 
                    AbstractMediaService.pauseIntent(context, cls),

                    0)

            ).build(),

            contentIntent = PendingIntent.getActivity(context,

            contentIntent = PendingIntent.getActivity(

                context,

                SharedIdsHelper.getIdForTag(context, AbstractMediaService.PENDING_INTENT_TAG),

                intent?.apply { putExtra(AbstractMediaService.EXTRA_TAB_ID, mediaTab?.id) }, 0)

                intent?.apply { putExtra(AbstractMediaService.EXTRA_TAB_ID, mediaTab?.id) },

                PendingIntent.FLAG_UPDATE_CURRENT

            )

        )

        MediaState.State.PAUSED -> NotificationData(

            title = mediaTab.getTitleOrUrl(context),
@@ -111,9 +114,12 @@ private fun BrowserState.toNotificationData( 
                    AbstractMediaService.playIntent(context, cls),

                    0)

            ).build(),

            contentIntent = PendingIntent.getActivity(context,

            contentIntent = PendingIntent.getActivity(

                context,

                SharedIdsHelper.getIdForTag(context, AbstractMediaService.PENDING_INTENT_TAG),

                intent?.apply { putExtra(AbstractMediaService.EXTRA_TAB_ID, mediaTab?.id) }, 0)

                intent?.apply { putExtra(AbstractMediaService.EXTRA_TAB_ID, mediaTab?.id) },

                PendingIntent.FLAG_UPDATE_CURRENT

            )

        )

        // Dummy notification that is only used to satisfy the requirement to ALWAYS call

        // startForeground with a notification.

components/feature/media/src/test/java/mozilla/components/feature/media/service/MediaServiceDelegateTest.kt

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import mozilla.components.support.test.libstate.ext.waitUntilIdle 
import mozilla.components.support.test.mock

import mozilla.components.support.test.robolectric.testContext

import mozilla.components.support.test.rule.MainCoroutineRule

import org.junit.Ignore

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith
@@ -102,6 +103,8 @@ class MediaServiceDelegateTest { 
    }



    @Test

    @Ignore("Since we started using FLAG_UPDATE_CURRENT on the PendingIntent Robolectric started failing with a NullPointerException")

    // https://github.com/robolectric/robolectric/issues/5673

    fun `Switching from playing to pause stops serving from being in the foreground`() {

        val store = BrowserStore(BrowserState(

            tabs = listOf(