Prevent audio control click handler feedback loops

Fixes #6356
Fixes #6406
Fixes #6169

Closes #6800
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2017-07-12 16:18:54 -07:00
parent 9dd508b6f5
commit c36db03a3a
6 changed files with 104 additions and 75 deletions

View File

@@ -0,0 +1,53 @@
package org.thoughtcrime.securesms.components;
import android.content.Context;
import android.os.Build;
import android.support.annotation.RequiresApi;
import android.util.AttributeSet;
import android.widget.ToggleButton;
public class AccessibleToggleButton extends ToggleButton {
private OnCheckedChangeListener listener;
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
public AccessibleToggleButton(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
}
public AccessibleToggleButton(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
public AccessibleToggleButton(Context context, AttributeSet attrs) {
super(context, attrs);
}
public AccessibleToggleButton(Context context) {
super(context);
}
@Override
public void setOnCheckedChangeListener(OnCheckedChangeListener listener) {
super.setOnCheckedChangeListener(listener);
this.listener = listener;
}
public void setChecked(boolean checked, boolean notifyListener) {
if (!notifyListener) {
super.setOnCheckedChangeListener(null);
}
super.setChecked(checked);
if (!notifyListener) {
super.setOnCheckedChangeListener(listener);
}
}
public OnCheckedChangeListener getOnCheckedChangeListener() {
return this.listener;
}
}

View File

@@ -6,6 +6,7 @@ import android.content.Context;
import android.media.AudioManager;
import android.os.Build;
import android.util.AttributeSet;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -16,15 +17,18 @@ import com.tomergoldst.tooltips.ToolTip;
import com.tomergoldst.tooltips.ToolTipsManager;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.components.AccessibleToggleButton;
import org.thoughtcrime.securesms.util.ServiceUtil;
import org.thoughtcrime.securesms.util.ViewUtil;
public class WebRtcCallControls extends LinearLayout {
private CompoundButton audioMuteButton;
private CompoundButton videoMuteButton;
private CompoundButton speakerButton;
private CompoundButton bluetoothButton;
private static final String TAG = WebRtcCallControls.class.getSimpleName();
private AccessibleToggleButton audioMuteButton;
private AccessibleToggleButton videoMuteButton;
private AccessibleToggleButton speakerButton;
private AccessibleToggleButton bluetoothButton;
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public WebRtcCallControls(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
@@ -106,14 +110,14 @@ public class WebRtcCallControls extends LinearLayout {
}
if (audioManager.isBluetoothScoOn()) {
bluetoothButton.setChecked(true);
speakerButton.setChecked(false);
bluetoothButton.setChecked(true, false);
speakerButton.setChecked(false, false);
} else if (audioManager.isSpeakerphoneOn()) {
speakerButton.setChecked(true);
bluetoothButton.setChecked(false);
speakerButton.setChecked(true, false);
bluetoothButton.setChecked(false, false);
} else {
speakerButton.setChecked(false);
bluetoothButton.setChecked(false);
speakerButton.setChecked(false, false);
bluetoothButton.setChecked(false, false);
}
}
@@ -122,11 +126,11 @@ public class WebRtcCallControls extends LinearLayout {
}
public void setVideoEnabled(boolean enabled) {
videoMuteButton.setChecked(enabled);
videoMuteButton.setChecked(enabled, false);
}
public void setMicrophoneEnabled(boolean enabled) {
audioMuteButton.setChecked(!enabled);
audioMuteButton.setChecked(!enabled, false);
}
public void setControlsEnabled(boolean enabled) {
@@ -145,12 +149,7 @@ public class WebRtcCallControls extends LinearLayout {
bluetoothButton.setAlpha(0.3f);
videoMuteButton.setAlpha(0.3f);
audioMuteButton.setAlpha(0.3f);
speakerButton.setChecked(false);
bluetoothButton.setChecked(false);
videoMuteButton.setChecked(false);
audioMuteButton.setChecked(false);
speakerButton.setEnabled(false);
bluetoothButton.setEnabled(false);
videoMuteButton.setEnabled(false);
@@ -176,14 +175,6 @@ public class WebRtcCallControls extends LinearLayout {
}
}
public void reset() {
audioMuteButton.setChecked(false);
videoMuteButton.setChecked(false);
speakerButton.setChecked(false);
bluetoothButton.setChecked(false);
bluetoothButton.setVisibility(View.GONE);
}
public static interface MuteButtonListener {
public void onToggle(boolean isMuted);
}

View File

@@ -135,22 +135,6 @@ public class WebRtcCallScreen extends FrameLayout implements Recipient.Recipient
this.endCallButton.setVisibility(View.INVISIBLE);
}
public void reset() {
setPersonInfo(Recipient.getUnknownRecipient());
setMinimized(false);
this.status.setText("");
this.recipient = null;
this.controls.reset();
this.untrustedIdentityExplanation.setText("");
this.untrustedIdentityContainer.setVisibility(View.GONE);
this.localRenderLayout.removeAllViews();
this.remoteRenderLayout.removeAllViews();
incomingCallOverlay.reset();
}
public void setIncomingCallActionListener(WebRtcIncomingCallOverlay.IncomingCallActionListener listener) {
incomingCallOverlay.setIncomingCallActionListener(listener);
}