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

Inline the group call reactions feature flag.

Browse source
This commit is contained in:
Nicholas Tinsley 2024-04-29 15:36:15 -04:00 • committed by Greyson Parrelli
parent f23476a4e9
commit d20f588802
5 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallOverflowPopupWindow.kt
View file

@ -35,14 +35,11 @@ class CallOverflowPopupWindow(private val activity: FragmentActivity, parentView
init { init {
val root = (contentView as LinearLayout) val root = (contentView as LinearLayout)
if (FeatureFlags.groupCallReactions()) {
val reactionScrubber = root.findViewById<CallReactionScrubber>(R.id.reaction_scrubber) val reactionScrubber = root.findViewById<CallReactionScrubber>(R.id.reaction_scrubber)
reactionScrubber.visible = true
reactionScrubber.initialize(activity.supportFragmentManager) { reactionScrubber.initialize(activity.supportFragmentManager) {
ApplicationDependencies.getSignalCallManager().react(it) ApplicationDependencies.getSignalCallManager().react(it)
dismiss() dismiss()
} }
}
if (FeatureFlags.groupCallRaiseHand()) { if (FeatureFlags.groupCallRaiseHand()) {
val raiseHand = root.findViewById<ConstraintLayout>(R.id.raise_hand_layout_parent) val raiseHand = root.findViewById<ConstraintLayout>(R.id.raise_hand_layout_parent)
raiseHand.visible = true raiseHand.visible = true

2
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcControls.java
View file

@ -159,7 +159,7 @@ public final class WebRtcControls {
} }
public boolean displayOverflow() { public boolean displayOverflow() {
return (FeatureFlags.groupCallReactions() || FeatureFlags.groupCallRaiseHand()) && isAtLeastOutgoing() && hasAtLeastOneRemote && isGroupCall(); return isAtLeastOutgoing() && hasAtLeastOneRemote && isGroupCall();
} }
public boolean displayMuteAudio() { public boolean displayMuteAudio() {

2
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java
View file

@ -917,10 +917,8 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
@Override @Override
public void onReactions(@NonNull GroupCall groupCall, List<Reaction> reactions) { public void onReactions(@NonNull GroupCall groupCall, List<Reaction> reactions) {
if (FeatureFlags.groupCallReactions()) {
processStateless(s -> serviceState.getActionProcessor().handleGroupCallReaction(serviceState, s, reactions)); processStateless(s -> serviceState.getActionProcessor().handleGroupCallReaction(serviceState, s, reactions));
} }
}
@Override @Override
public void onRaisedHands(@NonNull GroupCall groupCall, List<Long> raisedHands) { public void onRaisedHands(@NonNull GroupCall groupCall, List<Long> raisedHands) {

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

@ -113,7 +113,6 @@ public final class FeatureFlags {
private static final String IDEAL_DONATIONS = "android.ideal.donations.5"; private static final String IDEAL_DONATIONS = "android.ideal.donations.5";
public static final String IDEAL_ENABLED_REGIONS = "global.donations.idealEnabledRegions"; public static final String IDEAL_ENABLED_REGIONS = "global.donations.idealEnabledRegions";
public static final String SEPA_ENABLED_REGIONS = "global.donations.sepaEnabledRegions"; public static final String SEPA_ENABLED_REGIONS = "global.donations.sepaEnabledRegions";
private static final String CALLING_REACTIONS = "android.calling.reactions";
private static final String NOTIFICATION_THUMBNAIL_BLOCKLIST = "android.notificationThumbnailProductBlocklist"; private static final String NOTIFICATION_THUMBNAIL_BLOCKLIST = "android.notificationThumbnailProductBlocklist";
private static final String CALLING_RAISE_HAND = "android.calling.raiseHand"; private static final String CALLING_RAISE_HAND = "android.calling.raiseHand";
private static final String USE_ACTIVE_CALL_MANAGER = "android.calling.useActiveCallManager.5"; private static final String USE_ACTIVE_CALL_MANAGER = "android.calling.useActiveCallManager.5";
@ -197,7 +196,6 @@ public final class FeatureFlags {
IDEAL_DONATIONS, IDEAL_DONATIONS,
IDEAL_ENABLED_REGIONS, IDEAL_ENABLED_REGIONS,
SEPA_ENABLED_REGIONS, SEPA_ENABLED_REGIONS,
CALLING_REACTIONS,
NOTIFICATION_THUMBNAIL_BLOCKLIST, NOTIFICATION_THUMBNAIL_BLOCKLIST,
CALLING_RAISE_HAND, CALLING_RAISE_HAND,
USE_ACTIVE_CALL_MANAGER, USE_ACTIVE_CALL_MANAGER,
@ -278,7 +276,6 @@ public final class FeatureFlags {
PROMPT_FOR_NOTIFICATION_CONFIG, PROMPT_FOR_NOTIFICATION_CONFIG,
PROMPT_BATTERY_SAVER, PROMPT_BATTERY_SAVER,
CRASH_PROMPT_CONFIG, CRASH_PROMPT_CONFIG,
CALLING_REACTIONS,
NOTIFICATION_THUMBNAIL_BLOCKLIST, NOTIFICATION_THUMBNAIL_BLOCKLIST,
CALLING_RAISE_HAND, CALLING_RAISE_HAND,
VIDEO_RECORD_1X_ZOOM, VIDEO_RECORD_1X_ZOOM,
@ -679,13 +676,6 @@ public final class FeatureFlags {
return getString(SEPA_ENABLED_REGIONS, ""); return getString(SEPA_ENABLED_REGIONS, "");
} }
/**
* Whether or not group call reactions are enabled.
*/
public static boolean groupCallReactions() {
return getBoolean(CALLING_REACTIONS, false);
}
/** /**
* Whether or not group call raise hand is enabled. * Whether or not group call raise hand is enabled.
*/ */

3
app/src/main/res/layout/call_overflow_holder.xml
View file

@ -15,8 +15,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/calling_reaction_emoji_height" android:layout_height="@dimen/calling_reaction_emoji_height"
android:background="@drawable/conversation_reaction_overlay_background" android:background="@drawable/conversation_reaction_overlay_background"
android:elevation="4dp" android:elevation="4dp"/>
android:visibility="gone" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/raise_hand_layout_parent" android:id="@+id/raise_hand_layout_parent"