permissionlesstech/bitchat-android
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat-android.git synced 2026-07-25 11:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Resolve merge conflicts:"

Browse Source 
This reverts commit 3384cce51d, reversing
changes made to 69d18aae3c.
This commit is contained in:
callebtc
2025-09-21 08:17:04 +02:00
parent 3384cce51d
commit 14475fe7f1
95 changed files with 1669 additions and 7993 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/bitchat/android/net/OkHttpProvider.kt
+2 -3
View File
@@ -43,12 +43,11 @@ object OkHttpProvider {
private fun baseBuilderForCurrentProxy(): OkHttpClient.Builder {
val builder = OkHttpClient.Builder()
val socks: InetSocketAddress? = TorManager.currentSocksAddress()
// If a SOCKS address is defined, always use it. TorManager sets this as soon as Tor mode is ON,
// even before bootstrap, to prevent any direct connections from occurring.
if (socks != null) {
if (socks != null && TorManager.isProxyEnabled()) {
val proxy = Proxy(Proxy.Type.SOCKS, socks)
builder.proxy(proxy)
}
return builder
}
}