Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

fix: Ignore global proxy settings if system thinks there's none (#4744)

Browse source 
Otherwise a :0 proxy would break in Rust SDK.
This commit is contained in:
夜坂雅 2025-05-26 15:33:04 +08:00 • committed by GitHub
parent dbe75cd4ea
commit b39100ef6f
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/proxy/DefaultProxyProvider.kt
View file

@ -8,7 +8,9 @@
package io.element.android.libraries.matrix.impl.proxy package io.element.android.libraries.matrix.impl.proxy
import android.content.Context import android.content.Context
import android.net.ConnectivityManager
import android.provider.Settings import android.provider.Settings
import androidx.core.content.getSystemService
import com.squareup.anvil.annotations.ContributesBinding import com.squareup.anvil.annotations.ContributesBinding
import io.element.android.libraries.di.AppScope import io.element.android.libraries.di.AppScope
import io.element.android.libraries.di.ApplicationContext import io.element.android.libraries.di.ApplicationContext
@ -32,6 +34,13 @@ class DefaultProxyProvider @Inject constructor(
private val context: Context private val context: Context
) : ProxyProvider { ) : ProxyProvider {
override fun provides(): String? { override fun provides(): String? {
val defaultProxy = context.getSystemService<ConnectivityManager>()?.defaultProxy
if (defaultProxy == null) {
// Note: can be tested by running:
// adb shell settings put global http_proxy :0
Timber.d("No default proxy")
return null
}
return Settings.Global.getString(context.contentResolver, Settings.Global.HTTP_PROXY) return Settings.Global.getString(context.contentResolver, Settings.Global.HTTP_PROXY)
?.also { ?.also {
Timber.d("Using global proxy") Timber.d("Using global proxy")