From e9804eccbb50375f3b6bc0f4a13fbbf501618d31 Mon Sep 17 00:00:00 2001 From: Rashad Sookram Date: Fri, 15 Apr 2022 15:45:50 -0400 Subject: [PATCH] Disable audio level indicator in calls. --- .../securesms/components/webrtc/AudioIndicatorView.kt | 8 +++++++- .../securesms/service/webrtc/WebRtcActionProcessor.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/AudioIndicatorView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/AudioIndicatorView.kt index 8edbcd1f03..8ddcaf453e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/AudioIndicatorView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/AudioIndicatorView.kt @@ -50,6 +50,12 @@ class AudioIndicatorView(context: Context, attrs: AttributeSet) : FrameLayout(co fun bind(microphoneEnabled: Boolean, level: CallParticipant.AudioLevel?) { micMuted.visible = !microphoneEnabled + if (WebRtcActionProcessor.AUDIO_LEVELS_INTERVAL != null) { + bindAudioLevel(microphoneEnabled, level) + } + } + + private fun bindAudioLevel(microphoneEnabled: Boolean, level: CallParticipant.AudioLevel?) { val wasShowingAudioLevel = showAudioLevel showAudioLevel = microphoneEnabled && level != null @@ -89,7 +95,7 @@ class AudioIndicatorView(context: Context, attrs: AttributeSet) : FrameLayout(co val currentHeight = current?.animatedValue as? Float ?: 0f return ValueAnimator.ofFloat(currentHeight, finalHeight).apply { - duration = WebRtcActionProcessor.AUDIO_LEVELS_INTERVAL.toLong() + duration = WebRtcActionProcessor.AUDIO_LEVELS_INTERVAL?.toLong() ?: 0 interpolator = DecelerateInterpolator() } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcActionProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcActionProcessor.java index 61c2fce378..e9b38ff69f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcActionProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcActionProcessor.java @@ -78,7 +78,7 @@ import static org.thoughtcrime.securesms.service.webrtc.WebRtcData.ReceivedAnswe */ public abstract class WebRtcActionProcessor { - public static final int AUDIO_LEVELS_INTERVAL = 200; + @Nullable public static final Integer AUDIO_LEVELS_INTERVAL = null; protected final Context context; protected final WebRtcInteractor webRtcInteractor;