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

Jump to bottom

Add missing auto pixel when Duck Player set to always and navigating from YT thumbnail #5135

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+30 −11
Open

Add missing auto pixel when Duck Player set to always and navigating from YT thumbnail #5135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion app/src/main/java/com/duckduckgo/app/browser/duckplayer/DuckPlayerJSHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ import com.duckduckgo.duckplayer.api.DuckPlayer
import com.duckduckgo.duckplayer.api.DuckPlayer.DuckPlayerState.ENABLED
import com.duckduckgo.duckplayer.api.DuckPlayer.UserPreferences
import com.duckduckgo.duckplayer.api.ORIGIN_QUERY_PARAM
import com.duckduckgo.duckplayer.api.ORIGIN_QUERY_PARAM_AUTO
import com.duckduckgo.duckplayer.api.ORIGIN_QUERY_PARAM_OVERLAY
import com.duckduckgo.duckplayer.api.PrivatePlayerMode
import com.duckduckgo.duckplayer.api.PrivatePlayerMode.Enabled
import com.duckduckgo.js.messaging.api.JsCallbackData
import com.duckduckgo.js.messaging.api.SubscriptionEventData
import javax.inject.Inject
Expand Down Expand Up @@ -204,7 +206,14 @@ class DuckPlayerJSHelper @Inject constructor(
}
"openDuckPlayer" -> {
return data?.getString("href")?.let {
Navigate(it.toUri().buildUpon().appendQueryParameter(ORIGIN_QUERY_PARAM, ORIGIN_QUERY_PARAM_OVERLAY).build().toString(), mapOf())
if (duckPlayer.getUserPreferences().privatePlayerMode == Enabled) {
Navigate(it.toUri().buildUpon().appendQueryParameter(ORIGIN_QUERY_PARAM, ORIGIN_QUERY_PARAM_AUTO).build().toString(), mapOf())
} else {
Navigate(
it.toUri().buildUpon().appendQueryParameter(ORIGIN_QUERY_PARAM, ORIGIN_QUERY_PARAM_OVERLAY).build().toString(),
mapOf(),
)
}
}
}
"initialSetup" -> {
Expand Down
14 changes: 6 additions & 8 deletions duckplayer/duckplayer-impl/src/main/java/com/duckduckgo/duckplayer/impl/RealDuckPlayer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,8 @@ class RealDuckPlayer @Inject constructor(

private suspend fun createDuckPlayerUriFromYoutube(uri: Uri): String {
val videoIdQueryParam = duckPlayerFeatureRepository.getVideoIDQueryParam()
return "$DUCK_PLAYER_URL_BASE${uri.getQueryParameter(videoIdQueryParam)}?origin=auto"
val origin = uri.getQueryParameter(ORIGIN_QUERY_PARAM)?.let { it } ?: ORIGIN_QUERY_PARAM_AUTO
return "$DUCK_PLAYER_URL_BASE${uri.getQueryParameter(videoIdQueryParam)}?$ORIGIN_QUERY_PARAM=$origin"
}

override suspend fun intercept(
Expand Down Expand Up @@ -346,11 +347,6 @@ class RealDuckPlayer @Inject constructor(
withContext(dispatchers.main()) {
webView.loadUrl(createDuckPlayerUriFromYoutube(url))
}
if (url.getQueryParameter(ORIGIN_QUERY_PARAM) != ORIGIN_QUERY_PARAM_SERP_AUTO) {
pixel.fire(DUCK_PLAYER_VIEW_FROM_YOUTUBE_AUTOMATIC)
} else {
pixel.fire(DUCK_PLAYER_VIEW_FROM_SERP)
}
return WebResourceResponse(null, null, null)
}
return null
Expand Down Expand Up @@ -398,9 +394,11 @@ class RealDuckPlayer @Inject constructor(
webView.loadUrl(youtubeUrl)
}
val origin = url.getQueryParameter(ORIGIN_QUERY_PARAM)
if (origin == ORIGIN_QUERY_PARAM_SERP) {
if (origin == ORIGIN_QUERY_PARAM_SERP || origin == ORIGIN_QUERY_PARAM_SERP_AUTO) {
pixel.fire(DUCK_PLAYER_VIEW_FROM_SERP)
} else if (origin != ORIGIN_QUERY_PARAM_OVERLAY && origin != ORIGIN_QUERY_PARAM_AUTO) {
} else if (origin == ORIGIN_QUERY_PARAM_AUTO) {
pixel.fire(DUCK_PLAYER_VIEW_FROM_YOUTUBE_AUTOMATIC)
} else if (origin != ORIGIN_QUERY_PARAM_OVERLAY) {
pixel.fire(DUCK_PLAYER_VIEW_FROM_OTHER)
}
}
Expand Down
16 changes: 14 additions & 2 deletions ...ayer/duckplayer-impl/src/test/kotlin/com/duckduckgo/duckplayer/impl/RealDuckPlayerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,20 @@ class RealDuckPlayerTest {
assertNotNull(result)
}

@Test
fun whenUriIsDuckPlayerUriWithOriginAuto_interceptProcessesDuckPlayerUri() = runTest {
val request: WebResourceRequest = mock()
val url: Uri = Uri.parse("duck://player/12345?origin=auto")
val webView: WebView = mock()
whenever(mockDuckPlayerFeatureRepository.getUserPreferences()).thenReturn(UserPreferences(true, Enabled))

val result = testee.intercept(request, url, webView)

verify(webView).loadUrl("https://www.youtube-nocookie.com?videoID=12345")
verify(mockPixel).fire(DUCK_PLAYER_VIEW_FROM_YOUTUBE_AUTOMATIC)
assertNotNull(result)
}

@Test
fun whenUriIsDuckPlayerUriWithOpenInYouTube_interceptLoadsYouTubeUri() = runTest {
val request: WebResourceRequest = mock()
Expand Down Expand Up @@ -634,7 +648,6 @@ class RealDuckPlayerTest {
val result = testee.intercept(request, url, webView)

verify(webView).loadUrl("duck://player/12345?origin=auto")
verify(mockPixel).fire(DUCK_PLAYER_VIEW_FROM_YOUTUBE_AUTOMATIC)
assertNotNull(result)
}

Expand Down Expand Up @@ -677,7 +690,6 @@ class RealDuckPlayerTest {
val result = testee.intercept(request, url, webView)

verify(webView).loadUrl("duck://player/123456?origin=auto")
verify(mockPixel).fire(DUCK_PLAYER_VIEW_FROM_YOUTUBE_AUTOMATIC)
assertNotNull(result)
}

Expand Down
Loading