Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Play sound for raised hand.

Browse Source
This commit is contained in:
Nicholas Tinsley
2023-12-22 17:25:53 -05:00
committed by Clark Chen
parent b4f2208bae
commit 1b9cf631be
5 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupConnectedActionProcessor.java
View File

@@ -259,6 +259,8 @@ public class GroupConnectedActionProcessor extends GroupActionProcessor {
@Override
protected @NonNull WebRtcServiceState handleGroupCallRaisedHand(@NonNull WebRtcServiceState currentState, List<Long> raisedHands) {
Log.i(TAG, "handleGroupCallRaisedHand():");
boolean playSound = false;
long now = System.currentTimeMillis();
WebRtcServiceStateBuilder.CallInfoStateBuilder builder = currentState.builder().changeCallInfoState();
Long localDemuxId = currentState.getCallInfoState().requireGroupCall().getLocalDeviceState().getDemuxId();
@@ -270,6 +272,7 @@ public class GroupConnectedActionProcessor extends GroupActionProcessor {
boolean wasHandAlreadyRaised = updatedParticipant.isHandRaised();
if (raisedHandIndex >= 0 && !wasHandAlreadyRaised) {
builder.putParticipant(updatedParticipant.getCallParticipantId(), updatedParticipant.withHandRaisedTimestamp(now + raisedHandIndex));
playSound = true;
} else if (raisedHandIndex < 0 && wasHandAlreadyRaised) {
builder.putParticipant(updatedParticipant.getCallParticipantId(), updatedParticipant.withHandRaisedTimestamp(CallParticipant.HAND_LOWERED));
}
@@ -290,6 +293,10 @@ public class GroupConnectedActionProcessor extends GroupActionProcessor {
new CallParticipantId(localDemuxId, Recipient.self().getId())));
}
}
if (playSound) {
webRtcInteractor.playStateChangeUp();
}
return builder.build();
}
}

4
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcInteractor.java
View File

@@ -165,6 +165,10 @@ public class WebRtcInteractor {
WebRtcCallService.sendAudioManagerCommand(context, new AudioManagerCommand.SetDefaultDevice(recipientId, userDevice, clearUserEarpieceSelection));
}
public void playStateChangeUp() {
WebRtcCallService.sendAudioManagerCommand(context, new AudioManagerCommand.PlayStateChangeUp());
}
void peekGroupCallForRingingCheck(@NonNull GroupCallRingCheckInfo groupCallRingCheckInfo) {
signalCallManager.peekGroupCallForRingingCheck(groupCallRingCheckInfo);
}

7
app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/AudioManagerCommand.kt
View File

@@ -115,6 +115,13 @@ sealed class AudioManagerCommand : Parcelable {
}
}
class PlayStateChangeUp : AudioManagerCommand() {
companion object {
@JvmField
val CREATOR: Parcelable.Creator<PlayStateChangeUp> = ParcelCheat { PlayStateChangeUp() }
}
}
class ParcelCheat<T>(private val createFrom: (Parcel) -> T) : Parcelable.Creator<T> {
override fun createFromParcel(parcel: Parcel): T = createFrom(parcel)
override fun newArray(size: Int): Array<T?> = throw UnsupportedOperationException()

4
app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/AudioManagerCompat.java
View File

@@ -191,6 +191,10 @@ public abstract class AudioManagerCompat {
return (float) (1 - (Math.log(maxVolume + 1 - volume) / Math.log(maxVolume + 1)));
}
public float getVoiceCallVolume() {
return audioManager.getStreamVolume(AudioManager.STREAM_VOICE_CALL);
}
abstract public SoundPool createSoundPool();
abstract public boolean requestCallAudioFocus();

10
app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.kt
View File

@@ -44,6 +44,10 @@ sealed class SignalAudioManager(protected val context: Context, protected val ev
protected val incomingRinger = IncomingRinger(context)
protected val outgoingRinger = OutgoingRinger(context)
private val stateChangeUpSoundId = context.assets.openFd("sounds/state-change_confirm-up.ogg").use {
soundPool.load(it, 1)
}
companion object {
@JvmStatic
fun create(context: Context, eventListener: EventListener?): SignalAudioManager {
@@ -66,6 +70,7 @@ sealed class SignalAudioManager(protected val context: Context, protected val ev
is AudioManagerCommand.StartIncomingRinger -> startIncomingRinger(command.ringtoneUri, command.vibrate)
is AudioManagerCommand.SilenceIncomingRinger -> silenceIncomingRinger()
is AudioManagerCommand.StartOutgoingRinger -> startOutgoingRinger()
is AudioManagerCommand.PlayStateChangeUp -> playStateChangeUp()
}
}
}
@@ -81,6 +86,11 @@ sealed class SignalAudioManager(protected val context: Context, protected val ev
}
}
private fun playStateChangeUp() {
val volume: Float = androidAudioManager.voiceCallVolume
soundPool.play(stateChangeUpSoundId, volume, volume, 0, 0, 1f)
}
protected abstract fun initialize()
protected abstract fun start()
protected abstract fun stop(playDisconnect: Boolean)