TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-17 14:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed sonar ping from calls.

Browse Source 
People rarely understood what it meant, and the information is available
on the screen if-needed ('dialing' vs 'ringing').
This commit is contained in:
Greyson Parrelli 2019-01-30 15:42:21 -08:00
parent c5114e2cb3
commit 9797c54a4d
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/raw/redphone_sonarping.mp3
View File

Binary file not shown.

3
src/org/thoughtcrime/securesms/service/WebRtcCallService.java
View File

@ -426,7 +426,7 @@ public class WebRtcCallService extends Service implements InjectableType,
sendMessage(WebRtcViewModel.State.CALL_OUTGOING, recipient, localCameraState, remoteVideoEnabled, bluetoothAvailable, microphoneEnabled); sendMessage(WebRtcViewModel.State.CALL_OUTGOING, recipient, localCameraState, remoteVideoEnabled, bluetoothAvailable, microphoneEnabled);
lockManager.updatePhoneState(LockManager.PhoneState.IN_CALL); lockManager.updatePhoneState(LockManager.PhoneState.IN_CALL);
audioManager.initializeAudioForCall(); audioManager.initializeAudioForCall();
audioManager.startOutgoingRinger(OutgoingRinger.Type.SONAR); audioManager.startOutgoingRinger(OutgoingRinger.Type.RINGING);
bluetoothStateManager.setWantsConnection(true); bluetoothStateManager.setWantsConnection(true);
setCallInProgressNotification(TYPE_OUTGOING_RINGING, recipient); setCallInProgressNotification(TYPE_OUTGOING_RINGING, recipient);
@ -591,7 +591,6 @@ public class WebRtcCallService extends Service implements InjectableType,
if (this.recipient == null) throw new AssertionError("assert"); if (this.recipient == null) throw new AssertionError("assert");
this.callState = CallState.STATE_REMOTE_RINGING; this.callState = CallState.STATE_REMOTE_RINGING;
this.audioManager.startOutgoingRinger(OutgoingRinger.Type.RINGING);
sendMessage(WebRtcViewModel.State.CALL_RINGING, recipient, localCameraState, remoteVideoEnabled, bluetoothAvailable, microphoneEnabled); sendMessage(WebRtcViewModel.State.CALL_RINGING, recipient, localCameraState, remoteVideoEnabled, bluetoothAvailable, microphoneEnabled);
} }

4
src/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java
View File

@ -16,7 +16,6 @@ public class OutgoingRinger {
private static final String TAG = OutgoingRinger.class.getSimpleName(); private static final String TAG = OutgoingRinger.class.getSimpleName();
public enum Type { public enum Type {
SONAR,
RINGING, RINGING,
BUSY BUSY
} }
@ -32,8 +31,7 @@ public class OutgoingRinger {
public void start(Type type) { public void start(Type type) {
int soundId; int soundId;
if (type == Type.SONAR) soundId = R.raw.redphone_sonarping; if (type == Type.RINGING) soundId = R.raw.redphone_outring;
else if (type == Type.RINGING) soundId = R.raw.redphone_outring;
else if (type == Type.BUSY) soundId = R.raw.redphone_busy; else if (type == Type.BUSY) soundId = R.raw.redphone_busy;
else throw new IllegalArgumentException("Not a valid sound type"); else throw new IllegalArgumentException("Not a valid sound type");

4
src/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java
View File

@ -60,10 +60,6 @@ public class SignalAudioManager {
AudioManager audioManager = ServiceUtil.getAudioManager(context); AudioManager audioManager = ServiceUtil.getAudioManager(context);
audioManager.setMicrophoneMute(false); audioManager.setMicrophoneMute(false);
if (type == OutgoingRinger.Type.SONAR) {
audioManager.setSpeakerphoneOn(false);
}
audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION); audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
outgoingRinger.start(type); outgoingRinger.start(type);