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 7ced09ad45..96820a6a18 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 @@ -68,7 +68,7 @@ public class GroupConnectedActionProcessor extends GroupActionProcessor { if (connectionState == GroupCall.ConnectionState.CONNECTED || connectionState == GroupCall.ConnectionState.CONNECTING) { if (joinState == GroupCall.JoinState.JOINED) { groupCallState = WebRtcViewModel.GroupCallState.CONNECTED_AND_JOINED; - } else if (joinState == GroupCall.JoinState.JOINING) { + } else if (joinState == GroupCall.JoinState.JOINING || joinState == GroupCall.JoinState.PENDING) { groupCallState = WebRtcViewModel.GroupCallState.CONNECTED_AND_JOINING; } } 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 d10eca2437..0f61e13415 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 @@ -100,7 +100,7 @@ public class GroupJoiningActionProcessor extends GroupActionProcessor { .commit() .actionProcessor(actionProcessorFactory.createConnectedActionProcessor(webRtcInteractor)); - } else if (device.getJoinState() == GroupCall.JoinState.JOINING) { + } else if (device.getJoinState() == GroupCall.JoinState.JOINING || device.getJoinState() == GroupCall.JoinState.PENDING) { builder.changeCallInfoState() .groupCallState(WebRtcViewModel.GroupCallState.CONNECTED_AND_JOINING) .commit(); diff --git a/dependencies.gradle b/dependencies.gradle index 7c80253763..5ef1e5ec1e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -113,7 +113,7 @@ dependencyResolutionManagement { library('libsignal-client', 'org.signal', 'libsignal-client').versionRef('libsignal-client') library('libsignal-android', 'org.signal', 'libsignal-android').versionRef('libsignal-client') library('signal-aesgcmprovider', 'org.signal:aesgcmprovider:0.0.3') - library('signal-ringrtc', 'org.signal:ringrtc-android:2.29.0') + library('signal-ringrtc', 'org.signal:ringrtc-android:2.30.0') library('signal-android-database-sqlcipher', 'org.signal:sqlcipher-android:4.5.4-S2') // Third Party diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 39d7685c10..85a8748577 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -5008,12 +5008,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + +