add proxy support to NewPipeDownloaderImpl & YTPlayerUtils

z-huang · Jan 9, 2025 · 18c7caa · 18c7caa
1 parent 01f4df1
commit 18c7caa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/app/src/main/java/com/zionhuang/music/utils/YTPlayerUtils.kt b/app/src/main/java/com/zionhuang/music/utils/YTPlayerUtils.kt
@@ -15,7 +15,9 @@ import okhttp3.OkHttpClient
 
 object YTPlayerUtils {
 
-    private val httpClient = OkHttpClient.Builder().build()
+    private val httpClient = OkHttpClient.Builder()
+        .proxy(YouTube.proxy)
+        .build()
 
     /**
      * The main client is used for metadata and initial streams.

diff --git a/innertube/src/main/java/com/zionhuang/innertube/NewPipe.kt b/innertube/src/main/java/com/zionhuang/innertube/NewPipe.kt
@@ -14,10 +14,13 @@ import org.schabi.newpipe.extractor.exceptions.ParsingException
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException
 import org.schabi.newpipe.extractor.services.youtube.YoutubeJavaScriptPlayerManager
 import java.io.IOException
+import java.net.Proxy
 
-private object NewPipeDownloaderImpl : Downloader() {
+private class NewPipeDownloaderImpl(proxy: Proxy?) : Downloader() {
 
-    private val client = OkHttpClient.Builder().build()
+    private val client = OkHttpClient.Builder()
+        .proxy(proxy)
+        .build()
 
     @Throws(IOException::class, ReCaptchaException::class)
     override fun execute(request: Request): Response {
@@ -61,7 +64,7 @@ private object NewPipeDownloaderImpl : Downloader() {
 object NewPipeUtils {
 
     init {
-        NewPipe.init(NewPipeDownloaderImpl)
+        NewPipe.init(NewPipeDownloaderImpl(YouTube.proxy))
     }
 
     fun getSignatureTimestamp(videoId: String): Result<Int> = runCatching {