mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-05-03 23:15:44 +01:00
Update to RingRTC v2.68.0
This commit is contained in:
committed by
jeffrey-signal
parent
1c77c9d3fb
commit
798bf3ec3e
@@ -97,7 +97,7 @@ class CallLinkPreJoinActionProcessor(
|
||||
|
||||
try {
|
||||
groupCall.setOutgoingAudioMuted(true)
|
||||
groupCall.setOutgoingVideoMuted(true)
|
||||
groupCall.setOutgoingVideoMuted(true, false)
|
||||
groupCall.setDataMode(NetworkUtil.getCallingDataMode(context, groupCall.localDeviceState.networkRoute.localAdapterType))
|
||||
Log.i(TAG, "Connecting to group call: " + currentState.callInfoState.callRecipient.id)
|
||||
groupCall.connect()
|
||||
|
||||
@@ -71,7 +71,7 @@ public class CallSetupActionProcessorDelegate extends WebRtcActionProcessor {
|
||||
try {
|
||||
CallManager callManager = webRtcInteractor.getCallManager();
|
||||
callManager.setAudioEnable(currentState.getLocalDeviceState().isMicrophoneEnabled());
|
||||
callManager.setVideoEnable(currentState.getLocalDeviceState().getCameraState().isEnabled());
|
||||
callManager.setVideoEnable(currentState.getLocalDeviceState().getCameraState().isEnabled(), false);
|
||||
} catch (CallException e) {
|
||||
return callFailure(currentState, "Enabling audio/video failed: ", e);
|
||||
}
|
||||
@@ -108,7 +108,7 @@ public class CallSetupActionProcessorDelegate extends WebRtcActionProcessor {
|
||||
if ((enable && camera.isInitialized()) || !enable) {
|
||||
try {
|
||||
CallManager callManager = webRtcInteractor.getCallManager();
|
||||
callManager.setVideoEnable(enable);
|
||||
callManager.setVideoEnable(enable, false);
|
||||
} catch (CallException e) {
|
||||
Log.w(tag, "Unable change video enabled state to " + enable, e);
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ public class ConnectedCallActionProcessor extends DeviceAwareActionProcessor {
|
||||
Log.i(TAG, "handleSetEnableVideo(): call_id: " + currentState.getCallInfoState().requireActivePeer().getCallId());
|
||||
|
||||
try {
|
||||
webRtcInteractor.getCallManager().setVideoEnable(enable);
|
||||
webRtcInteractor.getCallManager().setVideoEnable(enable, false);
|
||||
} catch (CallException e) {
|
||||
return callFailure(currentState, "setVideoEnable() failed: ", e);
|
||||
}
|
||||
|
||||
@@ -91,7 +91,7 @@ public class GroupConnectedActionProcessor extends GroupActionProcessor {
|
||||
Camera camera = currentState.getVideoState().requireCamera();
|
||||
|
||||
try {
|
||||
groupCall.setOutgoingVideoMuted(!enable);
|
||||
groupCall.setOutgoingVideoMuted(!enable, false);
|
||||
} catch (CallException e) {
|
||||
return groupCallFailure(currentState, "Unable set video muted", e);
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@ public class GroupJoiningActionProcessor extends GroupActionProcessor {
|
||||
webRtcInteractor.updatePhoneState(WebRtcUtil.getInCallPhoneState(context, localVideoEnabled, remoteVideoEnabled));
|
||||
|
||||
try {
|
||||
groupCall.setOutgoingVideoMuted(!currentState.getLocalDeviceState().getCameraState().isEnabled());
|
||||
groupCall.setOutgoingVideoMuted(!currentState.getLocalDeviceState().getCameraState().isEnabled(), false);
|
||||
groupCall.setOutgoingAudioMuted(!currentState.getLocalDeviceState().isMicrophoneEnabled());
|
||||
groupCall.setDataMode(NetworkUtil.getCallingDataMode(context, device.getNetworkRoute().getLocalAdapterType()));
|
||||
} catch (CallException e) {
|
||||
@@ -146,7 +146,7 @@ public class GroupJoiningActionProcessor extends GroupActionProcessor {
|
||||
Camera camera = currentState.getVideoState().requireCamera();
|
||||
|
||||
try {
|
||||
groupCall.setOutgoingVideoMuted(!enable);
|
||||
groupCall.setOutgoingVideoMuted(!enable, false);
|
||||
} catch (CallException e) {
|
||||
return groupCallFailure(currentState, "Unable to set video muted", e);
|
||||
}
|
||||
|
||||
@@ -79,7 +79,7 @@ public class GroupPreJoinActionProcessor extends GroupActionProcessor {
|
||||
|
||||
try {
|
||||
groupCall.setOutgoingAudioMuted(true);
|
||||
groupCall.setOutgoingVideoMuted(true);
|
||||
groupCall.setOutgoingVideoMuted(true, false);
|
||||
groupCall.setDataMode(NetworkUtil.getCallingDataMode(context, groupCall.getLocalDeviceState().getNetworkRoute().getLocalAdapterType()));
|
||||
|
||||
Log.i(tag, "Connecting to group call: " + currentState.getCallInfoState().getCallRecipient().getId());
|
||||
@@ -197,7 +197,7 @@ public class GroupPreJoinActionProcessor extends GroupActionProcessor {
|
||||
|
||||
try {
|
||||
groupCall.setOutgoingVideoSource(currentState.getVideoState().requireLocalSink(), currentState.getVideoState().requireCamera());
|
||||
groupCall.setOutgoingVideoMuted(!currentState.getLocalDeviceState().getCameraState().isEnabled());
|
||||
groupCall.setOutgoingVideoMuted(!currentState.getLocalDeviceState().getCameraState().isEnabled(), false);
|
||||
groupCall.setOutgoingAudioMuted(!currentState.getLocalDeviceState().isMicrophoneEnabled());
|
||||
groupCall.setDataMode(NetworkUtil.getCallingDataMode(context, groupCall.getLocalDeviceState().getNetworkRoute().getLocalAdapterType()));
|
||||
|
||||
|
||||
@@ -235,7 +235,7 @@ public final class IncomingGroupCallActionProcessor extends DeviceAwareActionPro
|
||||
|
||||
try {
|
||||
groupCall.setOutgoingAudioMuted(true);
|
||||
groupCall.setOutgoingVideoMuted(true);
|
||||
groupCall.setOutgoingVideoMuted(true, false);
|
||||
groupCall.setDataMode(NetworkUtil.getCallingDataMode(context, groupCall.getLocalDeviceState().getNetworkRoute().getLocalAdapterType()));
|
||||
|
||||
Log.i(TAG, "Connecting to group call: " + currentState.getCallInfoState().getCallRecipient().getId());
|
||||
@@ -260,7 +260,7 @@ public final class IncomingGroupCallActionProcessor extends DeviceAwareActionPro
|
||||
|
||||
try {
|
||||
groupCall.setOutgoingVideoSource(currentState.getVideoState().requireLocalSink(), currentState.getVideoState().requireCamera());
|
||||
groupCall.setOutgoingVideoMuted(!answerWithVideo);
|
||||
groupCall.setOutgoingVideoMuted(!answerWithVideo, false);
|
||||
groupCall.setOutgoingAudioMuted(!currentState.getLocalDeviceState().isMicrophoneEnabled());
|
||||
groupCall.setDataMode(NetworkUtil.getCallingDataMode(context, groupCall.getLocalDeviceState().getNetworkRoute().getLocalAdapterType()));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user