From e76bec63a3f46cf930274c4d24b6d66f544b407c Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Thu, 8 Dec 2022 10:34:48 -0500 Subject: [PATCH] Remote ring small groups feature flag. --- .../org/thoughtcrime/securesms/WebRtcCallActivity.java | 2 +- .../sounds/custom/CustomNotificationsSettingsViewModel.kt | 3 +-- .../securesms/components/webrtc/WebRtcControls.java | 3 +-- .../service/webrtc/GroupJoiningActionProcessor.java | 3 +-- .../org/thoughtcrime/securesms/util/FeatureFlags.java | 8 -------- 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java index b9b9c276b9..b73865d83b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java @@ -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); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsViewModel.kt index 9d2aa51735..fa7e12416f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsViewModel.kt @@ -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 ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcControls.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcControls.java index f49c12b721..9e472071cc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcControls.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcControls.java @@ -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() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupJoiningActionProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupJoiningActionProcessor.java index f1d9e8bd00..f67e2b0bef 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupJoiningActionProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupJoiningActionProcessor.java @@ -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) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java index 24316913cf..ad0d4dd7fc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java @@ -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");