From 70ff47b81017a9ab79c617bfbbe49a825500638e Mon Sep 17 00:00:00 2001
From: AudricV <74829229+AudricV@users.noreply.github.com>
Date: Sat, 1 Feb 2025 15:39:07 +0100
Subject: [PATCH] [YouTube] Get visitorData from the service to get valid
 responses

---
 .../newpipe/util/potoken/PoTokenProviderImpl.kt | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/util/potoken/PoTokenProviderImpl.kt b/app/src/main/java/org/schabi/newpipe/util/potoken/PoTokenProviderImpl.kt
index 4cfcc6eb6..96c8b583e 100644
--- a/app/src/main/java/org/schabi/newpipe/util/potoken/PoTokenProviderImpl.kt
+++ b/app/src/main/java/org/schabi/newpipe/util/potoken/PoTokenProviderImpl.kt
@@ -6,6 +6,7 @@ import android.util.Log
 import org.schabi.newpipe.App
 import org.schabi.newpipe.BuildConfig
 import org.schabi.newpipe.extractor.NewPipe
+import org.schabi.newpipe.extractor.services.youtube.InnertubeClientRequestInfo
 import org.schabi.newpipe.extractor.services.youtube.PoTokenProvider
 import org.schabi.newpipe.extractor.services.youtube.PoTokenResult
 import org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper
@@ -49,8 +50,20 @@ object PoTokenProviderImpl : PoTokenProvider {
                     // create a new webPoTokenGenerator
                     webPoTokenGenerator = PoTokenWebView
                         .newPoTokenGenerator(App.getApp()).blockingGet()
-                    webPoTokenVisitorData = YoutubeParsingHelper
-                        .randomVisitorData(NewPipe.getPreferredContentCountry())
+
+                    val innertubeClientRequestInfo = InnertubeClientRequestInfo.ofWebClient()
+                    innertubeClientRequestInfo.clientInfo.clientVersion =
+                        YoutubeParsingHelper.getClientVersion()
+
+                    webPoTokenVisitorData = YoutubeParsingHelper.getVisitorDataFromInnertube(
+                        innertubeClientRequestInfo,
+                        NewPipe.getPreferredLocalization(),
+                        NewPipe.getPreferredContentCountry(),
+                        YoutubeParsingHelper.getYouTubeHeaders(),
+                        YoutubeParsingHelper.YOUTUBEI_V1_URL,
+                        null,
+                        false
+                    )
 
                     // The streaming poToken needs to be generated exactly once before generating
                     // any other (player) tokens.