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

Add missing static IPs.

Browse source 
Fixes #13513
This commit is contained in:
Greyson Parrelli 2024-04-11 11:07:55 -04:00
parent 34a36ddfea
commit 046b8da880
4 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle.kts
View file

@ -195,6 +195,7 @@ android {
buildConfigField("String[]", "SIGNAL_CONTENT_PROXY_IPS", rootProject.extra["content_proxy_ips"] as String)
buildConfigField("String[]", "SIGNAL_CDSI_IPS", rootProject.extra["cdsi_ips"] as String)
buildConfigField("String[]", "SIGNAL_SVR2_IPS", rootProject.extra["svr2_ips"] as String)
buildConfigField("String[]", "SIGNAL_KEY_BACKUP_IPS", rootProject.extra["key_backup_ips"] as String)
buildConfigField("String", "SIGNAL_AGENT", "\"OWA\"")
buildConfigField("String", "CDSI_MRENCLAVE", "\"0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57\"")
buildConfigField("String", "SVR2_MRENCLAVE", "\"a6622ad4656e1abcd0bc0ff17c229477747d2ded0495c4ebee7ed35c1789fa97\"")

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

@ -48,10 +48,12 @@ open class SignalServiceNetworkAccess(context: Context) {
BuildConfig.STORAGE_URL.stripProtocol() to BuildConfig.SIGNAL_STORAGE_IPS.toSet(),
BuildConfig.SIGNAL_CDN_URL.stripProtocol() to BuildConfig.SIGNAL_CDN_IPS.toSet(),
BuildConfig.SIGNAL_CDN2_URL.stripProtocol() to BuildConfig.SIGNAL_CDN2_IPS.toSet(),
BuildConfig.SIGNAL_CDN3_URL.stripProtocol() to BuildConfig.SIGNAL_CDN3_IPS.toSet(),
BuildConfig.SIGNAL_SFU_URL.stripProtocol() to BuildConfig.SIGNAL_SFU_IPS.toSet(),
BuildConfig.CONTENT_PROXY_HOST.stripProtocol() to BuildConfig.SIGNAL_CONTENT_PROXY_IPS.toSet(),
BuildConfig.SIGNAL_CDSI_URL.stripProtocol() to BuildConfig.SIGNAL_CDSI_IPS.toSet(),
BuildConfig.SIGNAL_SVR2_URL.stripProtocol() to BuildConfig.SIGNAL_SVR2_IPS.toSet()
BuildConfig.SIGNAL_SVR2_URL.stripProtocol() to BuildConfig.SIGNAL_SVR2_IPS.toSet(),
BuildConfig.SIGNAL_KEY_BACKUP_URL.stripProtocol() to BuildConfig.SIGNAL_KEY_BACKUP_IPS.toSet()
)
)
)

1
app/static-ips.gradle.kts
View file

@ -7,3 +7,4 @@ rootProject.extra["sfu_ips"] = """new String[]{"34.36.104.134"}"""
rootProject.extra["content_proxy_ips"] = """new String[]{"107.178.250.75"}"""
rootProject.extra["svr2_ips"] = """new String[]{"20.119.62.85"}"""
rootProject.extra["cdsi_ips"] = """new String[]{"40.122.45.194"}"""
rootProject.extra["key_backup_ips"] = """new String[]{"240.0.0.1"}"""

1
build-logic/plugins/src/main/java/translations.gradle
View file

@ -117,6 +117,7 @@ task resolveStaticIps {
rootProject.extra["content_proxy_ips"] = \"\"\"${staticIpResolver.resolveToBuildConfig("contentproxy.signal.org")}\"\"\"
rootProject.extra["svr2_ips"] = \"\"\"${staticIpResolver.resolveToBuildConfig("svr2.signal.org")}\"\"\"
rootProject.extra["cdsi_ips"] = \"\"\"${staticIpResolver.resolveToBuildConfig("cdsi.signal.org")}\"\"\"
rootProject.extra["key_backup_ips"] = "\"\"${staticIpResolver.resolveToBuildConfig("api.backup.signal.org")}\"\"\"
""".stripIndent().trim() + "\n"
}
}