diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt index 34b77ce6b8..795aa41327 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt @@ -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 = { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsState.kt index 138bcfc987..f32edeffab 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsState.kt @@ -30,6 +30,5 @@ data class InternalSettingsState( val useConversationItemV2ForMedia: Boolean, val hasPendingOneTimeDonation: Boolean, val hevcEncoding: Boolean, - val newCallingUi: Boolean, val forceSplitPane: Boolean ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsViewModel.kt index c8d6fbf639..46e3f75011 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsViewModel.kt @@ -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() diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.kt index 1003ef4afb..e47bd97313 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.kt @@ -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() diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreenMediator.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreenMediator.kt index 241a3744b1..6988fb4705 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreenMediator.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreenMediator.kt @@ -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) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/WebRtcCallActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/WebRtcCallActivity.kt index 37c4aed1db..ecbcb50a26 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/WebRtcCallActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/WebRtcCallActivity.kt @@ -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) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InternalValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InternalValues.kt index 5c01c8c9d4..ff5e59bac5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InternalValues.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InternalValues.kt @@ -31,7 +31,6 @@ class InternalValues internal constructor(store: KeyValueStore) : SignalStoreVal const val CONVERSATION_ITEM_V2_MEDIA: String = "internal.conversation_item_v2_media" const val WEB_SOCKET_SHADOWING_STATS: String = "internal.web_socket_shadowing_stats" const val ENCODE_HEVC: String = "internal.hevc_encoding" - const val NEW_CALL_UI: String = "internal.new.call.ui" const val FORCE_SPLIT_PANE_ON_COMPACT_LANDSCAPE: String = "internal.force.split.pane.on.compact.landscape.ui" const val SHOW_ARCHIVE_STATE_HINT: String = "internal.show_archive_state_hint" const val INCLUDE_DEBUGLOG_IN_BACKUP: String = "internal.include_debuglog_in_backup" @@ -168,8 +167,6 @@ class InternalValues internal constructor(store: KeyValueStore) : SignalStoreVal var hevcEncoding by booleanValue(ENCODE_HEVC, false).defaultForExternalUsers() - var newCallingUi: Boolean by booleanValue(NEW_CALL_UI, true).falseForExternalUsers() - var lastScrollPosition: Int by integerValue(LAST_SCROLL_POSITION, 0).defaultForExternalUsers() var useConversationItemV2Media by booleanValue(CONVERSATION_ITEM_V2_MEDIA, false).defaultForExternalUsers()