Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 00:29:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove new-calling-ui flag.

Browse Source
This commit is contained in:
Alex Hart
2026-01-09 12:03:51 -04:00
parent 1cf52cae71
commit dc6deee231
7 changed files with 5 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt
View File

@@ -579,14 +579,6 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
sectionHeaderPref(DSLSettingsText.from("Calling options"))
switchPref(
title = DSLSettingsText.from("Use new calling UI"),
isChecked = state.newCallingUi,
onClick = {
viewModel.setUseNewCallingUi(!state.newCallingUi)
}
)
clickPref(
title = DSLSettingsText.from("Display call quality survey"),
onClick = {

1
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsState.kt
View File

@@ -30,6 +30,5 @@ data class InternalSettingsState(
val useConversationItemV2ForMedia: Boolean,
val hasPendingOneTimeDonation: Boolean,
val hevcEncoding: Boolean,
val newCallingUi: Boolean,
val forceSplitPane: Boolean
)

6
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsViewModel.kt
View File

@@ -196,7 +196,6 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
useConversationItemV2ForMedia = SignalStore.internal.useConversationItemV2Media,
hasPendingOneTimeDonation = SignalStore.inAppPayments.getPendingOneTimeDonation() != null,
hevcEncoding = SignalStore.internal.hevcEncoding,
newCallingUi = SignalStore.internal.newCallingUi,
forceSplitPane = SignalStore.internal.forceSplitPane
)
@@ -208,11 +207,6 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
StoryOnboardingDownloadJob.enqueueIfNeeded()
}
fun setUseNewCallingUi(newCallingUi: Boolean) {
SignalStore.internal.newCallingUi = newCallingUi
refresh()
}
fun setForceSplitPane(forceSplitPane: Boolean) {
SignalStore.internal.forceSplitPane = forceSplitPane
refresh()

4
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.kt
View File

@@ -15,11 +15,11 @@ import org.thoughtcrime.securesms.events.GroupCallRaiseHandEvent
import org.thoughtcrime.securesms.events.GroupCallReactionEvent
import org.thoughtcrime.securesms.events.WebRtcViewModel
import org.thoughtcrime.securesms.groups.ui.GroupMemberEntry
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.ringrtc.CameraState
import org.thoughtcrime.securesms.service.webrtc.collections.ParticipantCollection
import org.thoughtcrime.securesms.service.webrtc.state.WebRtcEphemeralState
import org.thoughtcrime.securesms.util.RemoteConfig
import java.util.concurrent.TimeUnit
/**
@@ -83,7 +83,7 @@ data class CallParticipantsState(
} else {
listParticipants.addAll(remoteParticipants.listParticipants)
}
if (foldableState.isFlat && !SignalStore.internal.newCallingUi) {
if (foldableState.isFlat && !RemoteConfig.newCallUi) {
listParticipants.add(CallParticipant.EMPTY)
}
listParticipants.reverse()

3
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreenMediator.kt
View File

@@ -10,7 +10,6 @@ import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.components.webrtc.CallParticipantListUpdate
import org.thoughtcrime.securesms.components.webrtc.WebRtcControls
import org.thoughtcrime.securesms.events.WebRtcViewModel
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.util.RemoteConfig
import org.thoughtcrime.securesms.webrtc.CallParticipantsViewState
@@ -92,7 +91,7 @@ interface CallScreenMediator {
companion object {
fun create(activity: WebRtcCallActivity, viewModel: WebRtcCallViewModel): CallScreenMediator {
return if (RemoteConfig.newCallUi || (RemoteConfig.internalUser && SignalStore.internal.newCallingUi)) {
return if (RemoteConfig.newCallUi) {
ComposeCallScreenMediator(activity, viewModel)
} else {
ViewCallScreenMediator(activity, viewModel)

4
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/WebRtcCallActivity.kt
View File

@@ -182,7 +182,7 @@ class WebRtcCallActivity : BaseActivity(), SafetyNumberChangeDialog.Callback, Re
initializePendingParticipantFragmentListener()
if (!SignalStore.internal.newCallingUi) {
if (!RemoteConfig.newCallUi) {
WindowUtil.setNavigationBarColor(this, ContextCompat.getColor(this, R.color.signal_dark_colorSurface))
}
@@ -460,7 +460,7 @@ class WebRtcCallActivity : BaseActivity(), SafetyNumberChangeDialog.Callback, Re
private fun initializeViewModel() {
val orientation: Orientation = resolveOrientationFromContext()
if (orientation == Orientation.PORTRAIT_BOTTOM_EDGE && !SignalStore.internal.newCallingUi) {
if (orientation == Orientation.PORTRAIT_BOTTOM_EDGE && !RemoteConfig.newCallUi) {
WindowUtil.setNavigationBarColor(this, ContextCompat.getColor(this, R.color.signal_dark_colorSurface2))
WindowUtil.clearTranslucentNavigationBar(window)
}