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

Default to staging SFU on staging builds.

Browse source
This commit is contained in:
Rashad Sookram 2022-11-18 13:50:03 -05:00 • committed by Cody Henthorne
parent ff64c2a911
commit 81df9fcddb
4 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle
View file

@ -180,6 +180,7 @@ android {
buildConfigField "String", "SIGNAL_SERVICE_STATUS_URL", "\"uptime.signal.org\"" buildConfigField "String", "SIGNAL_SERVICE_STATUS_URL", "\"uptime.signal.org\""
buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api.backup.signal.org\"" buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api.backup.signal.org\""
buildConfigField "String", "SIGNAL_SFU_URL", "\"https://sfu.voip.signal.org\"" buildConfigField "String", "SIGNAL_SFU_URL", "\"https://sfu.voip.signal.org\""
buildConfigField "String", "SIGNAL_STAGING_SFU_URL", "\"https://sfu.staging.voip.signal.org\""
buildConfigField "String[]", "SIGNAL_SFU_INTERNAL_NAMES", "new String[]{\"Test\", \"Staging\", \"Development\"}" buildConfigField "String[]", "SIGNAL_SFU_INTERNAL_NAMES", "new String[]{\"Test\", \"Staging\", \"Development\"}"
buildConfigField "String[]", "SIGNAL_SFU_INTERNAL_URLS", "new String[]{\"https://sfu.test.voip.signal.org\", \"https://sfu.staging.voip.signal.org\", \"https://sfu.staging.test.voip.signal.org\"}" buildConfigField "String[]", "SIGNAL_SFU_INTERNAL_URLS", "new String[]{\"https://sfu.test.voip.signal.org\", \"https://sfu.staging.voip.signal.org\", \"https://sfu.staging.test.voip.signal.org\"}"
buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\"" buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""

4
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt
View file

@ -357,11 +357,11 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
sectionHeaderPref(DSLSettingsText.from("Group call server")) sectionHeaderPref(DSLSettingsText.from("Group call server"))
radioPref( radioPref(
title = DSLSettingsText.from("Default"), title = DSLSettingsText.from("Production server"),
summary = DSLSettingsText.from(BuildConfig.SIGNAL_SFU_URL), summary = DSLSettingsText.from(BuildConfig.SIGNAL_SFU_URL),
isChecked = state.callingServer == BuildConfig.SIGNAL_SFU_URL, isChecked = state.callingServer == BuildConfig.SIGNAL_SFU_URL,
onClick = { onClick = {
viewModel.setInternalGroupCallingServer(null) viewModel.setInternalGroupCallingServer(BuildConfig.SIGNAL_SFU_URL)
} }
) )

3
app/src/main/java/org/thoughtcrime/securesms/keyvalue/InternalValues.java
View file

@ -4,6 +4,7 @@ import androidx.annotation.NonNull;
import org.signal.ringrtc.CallManager; import org.signal.ringrtc.CallManager;
import org.thoughtcrime.securesms.BuildConfig; import org.thoughtcrime.securesms.BuildConfig;
import org.thoughtcrime.securesms.util.Environment;
import org.thoughtcrime.securesms.util.FeatureFlags; import org.thoughtcrime.securesms.util.FeatureFlags;
import java.util.Arrays; import java.util.Arrays;
@ -127,7 +128,7 @@ public final class InternalValues extends SignalStoreValues {
* internal users cannot be left on old servers. * internal users cannot be left on old servers.
*/ */
public synchronized @NonNull String groupCallingServer() { public synchronized @NonNull String groupCallingServer() {
String internalServer = FeatureFlags.internalUser() ? getString(CALLING_SERVER, null) : null; String internalServer = FeatureFlags.internalUser() ? getString(CALLING_SERVER, Environment.Calling.defaultSfuUrl()) : null;
if (internalServer != null && !Arrays.asList(BuildConfig.SIGNAL_SFU_INTERNAL_URLS).contains(internalServer)) { if (internalServer != null && !Arrays.asList(BuildConfig.SIGNAL_SFU_INTERNAL_URLS).contains(internalServer)) {
internalServer = null; internalServer = null;
} }

7
app/src/main/java/org/thoughtcrime/securesms/util/Environment.kt
View file

@ -17,4 +17,11 @@ object Environment {
publishableKey = BuildConfig.STRIPE_PUBLISHABLE_KEY publishableKey = BuildConfig.STRIPE_PUBLISHABLE_KEY
) )
} }
object Calling {
@JvmStatic
fun defaultSfuUrl(): String {
return if (IS_STAGING) BuildConfig.SIGNAL_STAGING_SFU_URL else BuildConfig.SIGNAL_SFU_URL
}
}
} }