Skip to content

Commit 14e08f2

Browse files
committed
Match video ID from embed and webView
1 parent fa339bd commit 14e08f2

File tree

1 file changed

+9
-4
lines changed
  • duckplayer/duckplayer-impl/src/main/java/com/duckduckgo/duckplayer/impl

1 file changed

+9
-4
lines changed

duckplayer/duckplayer-impl/src/main/java/com/duckduckgo/duckplayer/impl/RealDuckPlayer.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,13 @@ class RealDuckPlayer @Inject constructor(
265265
return uri.host?.removePrefix("www.") == embedUrl
266266
}
267267

268-
private fun isYouTubeNoCookieEmbedUri(uri: Uri): Boolean {
269-
// TODO (cbarreiro) check video ID against webView URL
270-
return isYouTubeNoCookieUri(uri) && uri.pathSegments.firstOrNull() == "embed"
268+
private fun isYouTubeNoCookieEmbedUri(
269+
uri: Uri,
270+
webViewUrl: String?,
271+
): Boolean {
272+
webViewUrl ?: return false
273+
if (!isYouTubeNoCookieUri(uri) || uri.pathSegments.firstOrNull() != "embed") return false
274+
return webViewUrl.toUri().getQueryParameter(DUCK_PLAYER_VIDEO_ID_QUERY_PARAM) == uri.pathSegments.getOrNull(1)
271275
}
272276

273277
override fun isSimulatedYoutubeNoCookie(uri: Uri): Boolean {
@@ -319,11 +323,12 @@ class RealDuckPlayer @Inject constructor(
319323
return processDuckPlayerUri(url, webView)
320324
} else {
321325
if (!isFeatureEnabled) return null
326+
val webViewUrl = withContext(dispatchers.main()) { webView.url }
322327
if (isYoutubeWatchUrl(url)) {
323328
return processYouTubeWatchUri(request, url, webView)
324329
} else if (isSimulatedYoutubeNoCookie(url)) {
325330
return processSimulatedYouTubeNoCookieUri(url, webView)
326-
} else if (duckPlayerFeature.addCustomEmbedReferer().isEnabled() && isYouTubeNoCookieEmbedUri(url)) {
331+
} else if (duckPlayerFeature.addCustomEmbedReferer().isEnabled() && isYouTubeNoCookieEmbedUri(url, webViewUrl)) {
327332
return try {
328333
WebResourceResponse("text/html", "UTF-8", getEmbedWithReferer(request))
329334
} catch (e: IOException) {

0 commit comments

Comments
 (0)