empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Improve network reliability.

Browse source
This commit is contained in:
Greyson Parrelli 2024-08-13 12:41:35 -04:00
parent c2bdac80dc
commit 057eacfb3b
2 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt
View file

@ -22,7 +22,6 @@ import org.thoughtcrime.securesms.net.StaticDns
import org.whispersystems.signalservice.api.push.TrustStore
import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl
import org.whispersystems.signalservice.internal.configuration.SignalCdsiUrl
import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupServiceUrl
import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration
import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl
import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl
@ -68,6 +67,8 @@ open class SignalServiceNetworkAccess(context: Context) {
private const val COUNTRY_CODE_IRAN = 98
private const val COUNTRY_CODE_CUBA = 53
private const val COUNTRY_CODE_UZBEKISTAN = 998
private const val COUNTRY_CODE_RUSSIA = 7
private const val COUNTRY_CODE_VENEZUELA = 58
private const val G_HOST = "reflector-nrgwuv7kwq-uc.a.run.app"
private const val F_SERVICE_HOST = "chat-signal.global.ssl.fastly.net"
@ -77,7 +78,6 @@ open class SignalServiceNetworkAccess(context: Context) {
private const val F_CDN3_HOST = "cdn3-signal.global.ssl.fastly.net"
private const val F_CDSI_HOST = "cdsi-signal.global.ssl.fastly.net"
private const val F_SVR2_HOST = "svr2-signal.global.ssl.fastly.net"
private const val F_KBS_HOST = "api.backup.signal.org.global.prod.fastly.net"
private val GMAPS_CONNECTION_SPEC = ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
.tlsVersions(TlsVersion.TLS_1_2)
@ -208,8 +208,12 @@ open class SignalServiceNetworkAccess(context: Context) {
COUNTRY_CODE_UZBEKISTAN to buildGConfiguration(
listOf(HostConfig("https://www.google.co.uz", G_HOST, GMAIL_CONNECTION_SPEC)) + baseGHostConfigs
),
COUNTRY_CODE_VENEZUELA to buildGConfiguration(
listOf(HostConfig("https://www.google.co.ve", G_HOST, GMAIL_CONNECTION_SPEC)) + baseGHostConfigs
),
COUNTRY_CODE_IRAN to fConfig,
COUNTRY_CODE_CUBA to fConfig
COUNTRY_CODE_CUBA to fConfig,
COUNTRY_CODE_RUSSIA to fConfig
)
private val defaultCensoredConfiguration: SignalServiceConfiguration = buildGConfiguration(baseGHostConfigs)
@ -289,7 +293,6 @@ open class SignalServiceNetworkAccess(context: Context) {
val cdnUrls: Array<SignalCdnUrl> = hostConfigs.map { SignalCdnUrl("${it.baseUrl}/cdn", it.host, gTrustStore, it.connectionSpec) }.toTypedArray()
val cdn2Urls: Array<SignalCdnUrl> = hostConfigs.map { SignalCdnUrl("${it.baseUrl}/cdn2", it.host, gTrustStore, it.connectionSpec) }.toTypedArray()
val cdn3Urls: Array<SignalCdnUrl> = hostConfigs.map { SignalCdnUrl("${it.baseUrl}/cdn3", it.host, gTrustStore, it.connectionSpec) }.toTypedArray()
val kbsUrls: Array<SignalKeyBackupServiceUrl> = hostConfigs.map { SignalKeyBackupServiceUrl("${it.baseUrl}/backup", it.host, gTrustStore, it.connectionSpec) }.toTypedArray()
val storageUrls: Array<SignalStorageUrl> = hostConfigs.map { SignalStorageUrl("${it.baseUrl}/storage", it.host, gTrustStore, it.connectionSpec) }.toTypedArray()
val cdsiUrls: Array<SignalCdsiUrl> = hostConfigs.map { SignalCdsiUrl("${it.baseUrl}/cdsi", it.host, gTrustStore, it.connectionSpec) }.toTypedArray()
val svr2Urls: Array<SignalSvr2Url> = hostConfigs.map { SignalSvr2Url("${it.baseUrl}/svr2", gTrustStore, it.host, it.connectionSpec) }.toTypedArray()

17
libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalKeyBackupServiceUrl.java
View file

@ -1,17 +0,0 @@
package org.whispersystems.signalservice.internal.configuration;
import org.whispersystems.signalservice.api.push.TrustStore;
import okhttp3.ConnectionSpec;
public class SignalKeyBackupServiceUrl extends SignalUrl {
public SignalKeyBackupServiceUrl(String url, TrustStore trustStore) {
super(url, trustStore);
}
public SignalKeyBackupServiceUrl(String url, String hostHeader, TrustStore trustStore, ConnectionSpec connectionSpec) {
super(url, hostHeader, trustStore, connectionSpec);
}
}