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

Remote ring small groups feature flag.

Browse Source
This commit is contained in:
Cody Henthorne
2022-12-08 10:34:48 -05:00
committed by Alex Hart
parent fc2b67aa0f
commit e76bec63a3
5 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsViewModel.kt
View File

@@ -9,7 +9,6 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.notifications.NotificationChannels
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.recipients.RecipientId
import org.thoughtcrime.securesms.util.FeatureFlags
import org.thoughtcrime.securesms.util.livedata.Store
class CustomNotificationsSettingsViewModel(
@@ -35,7 +34,7 @@ class CustomNotificationsSettingsViewModel(
RecipientTable.VibrateState.ENABLED -> true
RecipientTable.VibrateState.DISABLED -> false
},
showCallingOptions = recipient.isRegistered && (!recipient.isGroup || FeatureFlags.groupCallRinging()),
showCallingOptions = recipient.isRegistered,
callSound = recipient.callRingtone,
callVibrateState = recipient.callVibrate
)

3
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcControls.java
View File

@@ -8,7 +8,6 @@ import androidx.annotation.Px;
import androidx.annotation.StringRes;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager;
import java.util.Set;
@@ -217,7 +216,7 @@ public final class WebRtcControls {
}
boolean displayRingToggle() {
return FeatureFlags.groupCallRinging() && isPreJoin() && isGroupCall() && !hasAtLeastOneRemote;
return isPreJoin() && isGroupCall() && !hasAtLeastOneRemote;
}
private boolean isError() {