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

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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
View file

@ -602,7 +602,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
}
public void handleGroupMemberCountChange(int count) {
boolean canRing = count <= FeatureFlags.maxGroupCallRingSize() && FeatureFlags.groupCallRinging();
boolean canRing = count <= FeatureFlags.maxGroupCallRingSize();
callScreen.enableRingGroup(canRing);
ApplicationDependencies.getSignalCallManager().setRingGroup(canRing);
}

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() {

3
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupJoiningActionProcessor.java
View file

@ -13,7 +13,6 @@ import org.thoughtcrime.securesms.ringrtc.Camera;
import org.thoughtcrime.securesms.ringrtc.RemotePeer;
import org.thoughtcrime.securesms.service.webrtc.state.WebRtcServiceState;
import org.thoughtcrime.securesms.service.webrtc.state.WebRtcServiceStateBuilder;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.util.NetworkUtil;
import org.thoughtcrime.securesms.webrtc.locks.LockManager;
@ -80,7 +79,7 @@ public class GroupJoiningActionProcessor extends GroupActionProcessor {
throw new RuntimeException(e);
}
if (FeatureFlags.groupCallRinging() && currentState.getCallSetupState(RemotePeer.GROUP_CALL_ID).shouldRingGroup()) {
if (currentState.getCallSetupState(RemotePeer.GROUP_CALL_ID).shouldRingGroup()) {
try {
groupCall.ringAll();
} catch (CallException e) {

8
app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
View file

@ -80,7 +80,6 @@ public final class FeatureFlags {
private static final String SENDER_KEY_MAX_AGE = "android.senderKeyMaxAge";
private static final String RETRY_RECEIPTS = "android.retryReceipts";
private static final String MAX_GROUP_CALL_RING_SIZE = "global.calling.maxGroupCallRingSize";
private static final String GROUP_CALL_RINGING = "android.calling.groupCallRinging.3";
private static final String STORIES_TEXT_FUNCTIONS = "android.stories.text.functions";
private static final String HARDWARE_AEC_BLOCKLIST_MODELS = "android.calling.hardwareAecBlockList";
private static final String SOFTWARE_AEC_BLOCKLIST_MODELS = "android.calling.softwareAecBlockList";
@ -140,7 +139,6 @@ public final class FeatureFlags {
RETRY_RESPOND_MAX_AGE,
RETRY_RECEIPTS,
MAX_GROUP_CALL_RING_SIZE,
GROUP_CALL_RINGING,
SENDER_KEY_MAX_AGE,
STORIES_TEXT_FUNCTIONS,
HARDWARE_AEC_BLOCKLIST_MODELS,
@ -216,7 +214,6 @@ public final class FeatureFlags {
RETRY_RESPOND_MAX_AGE,
RETRY_RECEIPTS,
MAX_GROUP_CALL_RING_SIZE,
GROUP_CALL_RINGING,
SENDER_KEY_MAX_AGE,
DONATE_MEGAPHONE,
HARDWARE_AEC_BLOCKLIST_MODELS,
@ -440,11 +437,6 @@ public final class FeatureFlags {
return getLong(MAX_GROUP_CALL_RING_SIZE, 16);
}
/** Whether or not to show the group call ring toggle in the UI. */
public static boolean groupCallRinging() {
return getBoolean(GROUP_CALL_RINGING, false);
}
/** A comma-separated list of country codes where payments should be disabled. */
public static String paymentsCountryBlocklist() {
return getString(PAYMENTS_COUNTRY_BLOCKLIST, "98,963,53,850,7");