diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkPreJoinActionProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkPreJoinActionProcessor.kt index 96f80bea1e..b5d11dc439 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkPreJoinActionProcessor.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkPreJoinActionProcessor.kt @@ -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() diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallSetupActionProcessorDelegate.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallSetupActionProcessorDelegate.java index af1eabe671..301c895da4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallSetupActionProcessorDelegate.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallSetupActionProcessorDelegate.java @@ -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); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/ConnectedCallActionProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/ConnectedCallActionProcessor.java index 76ff21c5c8..f709d9fe14 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/ConnectedCallActionProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/ConnectedCallActionProcessor.java @@ -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); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupConnectedActionProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupConnectedActionProcessor.java index 43dbe216af..3f42f540da 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupConnectedActionProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupConnectedActionProcessor.java @@ -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); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupJoiningActionProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupJoiningActionProcessor.java index bcdd9714f4..0df0b6d042 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupJoiningActionProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupJoiningActionProcessor.java @@ -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); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupPreJoinActionProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupPreJoinActionProcessor.java index add1711d57..bf27ab8be5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupPreJoinActionProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupPreJoinActionProcessor.java @@ -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())); diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IncomingGroupCallActionProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IncomingGroupCallActionProcessor.java index 58d6b8a63b..6916e6bce4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IncomingGroupCallActionProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IncomingGroupCallActionProcessor.java @@ -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())); diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0980614082..f16bb59dbe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -172,7 +172,7 @@ libsignal-client = { module = "org.signal:libsignal-client", version.ref = "libs libsignal-android = { module = "org.signal:libsignal-android", version.ref = "libsignal-client" } protobuf-gradle-plugin = { module = "com.google.protobuf:protobuf-gradle-plugin", version.ref = "protobuf-gradle-plugin" } signal-aesgcmprovider = "org.signal:aesgcmprovider:0.0.4" -signal-ringrtc = "org.signal:ringrtc-android:2.67.2" +signal-ringrtc = "org.signal:ringrtc-android:2.68.0" # Third Party signal-android-database-sqlcipher = "net.zetetic:sqlcipher-android:4.13.0" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 8429f32c30..f352af079b 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -16829,12 +16829,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + +