From c177de2ec3b336bd14955bbba9769eff3dd40028 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 23 Jun 2023 11:16:32 -0400 Subject: [PATCH] Add CDSI and SVR2 to static IP list. --- app/build.gradle | 2 ++ .../thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt | 4 +++- build-logic/plugins/src/main/java/translations.gradle | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 6e528994a0..8143c42e95 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -199,6 +199,8 @@ android { buildConfigField "String[]", "SIGNAL_KBS_IPS", kbs_ips buildConfigField "String[]", "SIGNAL_SFU_IPS", sfu_ips buildConfigField "String[]", "SIGNAL_CONTENT_PROXY_IPS", content_proxy_ips + buildConfigField "String[]", "SIGNAL_CDSI_IPS", cdsi_ips + buildConfigField "String[]", "SIGNAL_SVR2_IPS", svr2_ips buildConfigField "String", "SIGNAL_AGENT", "\"OWA\"" buildConfigField "String", "CDSI_MRENCLAVE", "\"0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57\"" buildConfigField "String", "SVR2_MRENCLAVE", "\"6ee1042f9e20f880326686dd4ba50c25359f01e9f733eeba4382bca001d45094\"" diff --git a/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt b/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt index 8ed5a1b217..f39b40d7f7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt @@ -50,7 +50,9 @@ open class SignalServiceNetworkAccess(context: Context) { BuildConfig.SIGNAL_CDN2_URL.stripProtocol() to BuildConfig.SIGNAL_CDN2_IPS.toSet(), BuildConfig.SIGNAL_KEY_BACKUP_URL.stripProtocol() to BuildConfig.SIGNAL_KBS_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.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() ) ) ) diff --git a/build-logic/plugins/src/main/java/translations.gradle b/build-logic/plugins/src/main/java/translations.gradle index 9b089e8e79..ef6179fc6b 100644 --- a/build-logic/plugins/src/main/java/translations.gradle +++ b/build-logic/plugins/src/main/java/translations.gradle @@ -133,6 +133,8 @@ task postTranslateIpFetch { ext.kbs_ips='${staticIpResolver.resolveToBuildConfig("api.backup.signal.org")}' ext.sfu_ips='${staticIpResolver.resolveToBuildConfig("sfu.voip.signal.org")}' ext.content_proxy_ips='${staticIpResolver.resolveToBuildConfig("contentproxy.signal.org")}' + ext.svr2_ips='${staticIpResolver.resolveToBuildConfig("svr2.signal.org")}' + ext.cdsi_ips='${staticIpResolver.resolveToBuildConfig("cdsi.signal.org")}' """.stripIndent().trim() } }