diff --git a/res/raw/redphone_sonarping.mp3 b/res/raw/redphone_sonarping.mp3 deleted file mode 100644 index 3f32a9c37..000000000 Binary files a/res/raw/redphone_sonarping.mp3 and /dev/null differ diff --git a/src/org/thoughtcrime/securesms/service/WebRtcCallService.java b/src/org/thoughtcrime/securesms/service/WebRtcCallService.java index 0459dc3a6..533b3769d 100644 --- a/src/org/thoughtcrime/securesms/service/WebRtcCallService.java +++ b/src/org/thoughtcrime/securesms/service/WebRtcCallService.java @@ -426,7 +426,7 @@ public class WebRtcCallService extends Service implements InjectableType, sendMessage(WebRtcViewModel.State.CALL_OUTGOING, recipient, localCameraState, remoteVideoEnabled, bluetoothAvailable, microphoneEnabled); lockManager.updatePhoneState(LockManager.PhoneState.IN_CALL); audioManager.initializeAudioForCall(); - audioManager.startOutgoingRinger(OutgoingRinger.Type.SONAR); + audioManager.startOutgoingRinger(OutgoingRinger.Type.RINGING); bluetoothStateManager.setWantsConnection(true); setCallInProgressNotification(TYPE_OUTGOING_RINGING, recipient); @@ -591,7 +591,6 @@ public class WebRtcCallService extends Service implements InjectableType, if (this.recipient == null) throw new AssertionError("assert"); this.callState = CallState.STATE_REMOTE_RINGING; - this.audioManager.startOutgoingRinger(OutgoingRinger.Type.RINGING); sendMessage(WebRtcViewModel.State.CALL_RINGING, recipient, localCameraState, remoteVideoEnabled, bluetoothAvailable, microphoneEnabled); } diff --git a/src/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java b/src/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java index 7253cefc4..1742d19ae 100644 --- a/src/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java +++ b/src/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java @@ -16,7 +16,6 @@ public class OutgoingRinger { private static final String TAG = OutgoingRinger.class.getSimpleName(); public enum Type { - SONAR, RINGING, BUSY } @@ -32,8 +31,7 @@ public class OutgoingRinger { public void start(Type type) { int soundId; - if (type == Type.SONAR) soundId = R.raw.redphone_sonarping; - else if (type == Type.RINGING) soundId = R.raw.redphone_outring; + if (type == Type.RINGING) soundId = R.raw.redphone_outring; else if (type == Type.BUSY) soundId = R.raw.redphone_busy; else throw new IllegalArgumentException("Not a valid sound type"); diff --git a/src/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java b/src/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java index 43894d661..1dead5caf 100644 --- a/src/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java +++ b/src/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java @@ -60,10 +60,6 @@ public class SignalAudioManager { AudioManager audioManager = ServiceUtil.getAudioManager(context); audioManager.setMicrophoneMute(false); - if (type == OutgoingRinger.Type.SONAR) { - audioManager.setSpeakerphoneOn(false); - } - audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION); outgoingRinger.start(type);