kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-15 14:50:30 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #3052 from Isira-Seneviratne/HttpUrl_ProxyHelper

Browse Source 
Use HttpUrl in ProxyHelper.
This commit is contained in:
Bnyro 2023-02-13 13:28:02 +01:00 committed by GitHub
commit aba6dcc1d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/com/github/libretube/helpers/ProxyHelper.kt
View File

@ -2,51 +2,29 @@ package com.github.libretube.helpers
import com.github.libretube.api.RetrofitInstance import com.github.libretube.api.RetrofitInstance
import com.github.libretube.constants.PreferenceKeys import com.github.libretube.constants.PreferenceKeys
import java.net.URI
import java.net.URLDecoder
import java.nio.charset.StandardCharsets
import java.util.*
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
object ProxyHelper { object ProxyHelper {
private fun getImageProxyUrl(): String? {
val url = PreferenceHelper.getString(PreferenceKeys.IMAGE_PROXY_URL, "")
return if (url != "") url else null
}
private fun setImageProxyUrl(url: String) {
PreferenceHelper.putString(PreferenceKeys.IMAGE_PROXY_URL, url)
}
fun fetchProxyUrl() { fun fetchProxyUrl() {
CoroutineScope(Dispatchers.IO).launch { CoroutineScope(Dispatchers.IO).launch {
runCatching { runCatching {
RetrofitInstance.api.getConfig().imageProxyUrl?.let { RetrofitInstance.api.getConfig().imageProxyUrl?.let {
setImageProxyUrl(it) PreferenceHelper.putString(PreferenceKeys.IMAGE_PROXY_URL, it)
} }
} }
} }
} }
fun rewriteUrl(url: String?): String? { fun rewriteUrl(url: String?): String? {
url ?: return null val proxyUrl = PreferenceHelper.getString(PreferenceKeys.IMAGE_PROXY_URL, "")
.toHttpUrlOrNull() ?: return url
val proxyUrl = getImageProxyUrl() return url?.toHttpUrlOrNull()?.newBuilder()
proxyUrl ?: return url ?.host(proxyUrl.host)
?.port(proxyUrl.port)
runCatching { ?.toString()
val originalUri = URI(url)
val newUri = URI(
originalUri.scheme.lowercase(Locale.US),
URI(proxyUrl).authority,
originalUri.path,
originalUri.query,
originalUri.fragment
)
return URLDecoder.decode(newUri.toString(), StandardCharsets.UTF_8.toString())
}
return url
} }
} }