From a9475ef153525e6c8411db280e7a37cc04e234a2 Mon Sep 17 00:00:00 2001 From: Jim Gustafson Date: Thu, 5 Jun 2025 08:22:35 -0700 Subject: [PATCH] Update to RingRTC v2.53.0 --- .../service/webrtc/CallLinkPreJoinActionProcessor.kt | 1 + .../securesms/service/webrtc/SignalCallManager.java | 2 +- .../service/webrtc/links/SignalCallLinkManager.kt | 6 +++++- gradle/libs.versions.toml | 2 +- gradle/verification-metadata.xml | 10 +++++----- 5 files changed, 13 insertions(+), 8 deletions(-) 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 5656fe067f..40074d5a91 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 @@ -63,6 +63,7 @@ class CallLinkPreJoinActionProcessor( SignalStore.internal.groupCallingServer, callLinkAuthCredentialPresentation.serialize(), callLinkRootKey, + null, callLink.credentials.adminPassBytes, ByteArray(0), AUDIO_LEVELS_INTERVAL, diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java index 890885def9..2778386ea6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java @@ -417,7 +417,7 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall. CallLinkSecretParams.deriveFromRootKey(callLinkRootKey.getKeyBytes()) ); - callManager.peekCallLinkCall(SignalStore.internal().getGroupCallingServer(), callLinkAuthCredentialPresentation.serialize(), callLinkRootKey, peekInfo -> { + callManager.peekCallLinkCall(SignalStore.internal().getGroupCallingServer(), callLinkAuthCredentialPresentation.serialize(), callLinkRootKey, null, peekInfo -> { PeekInfo info = peekInfo.getValue(); if (info == null) { Log.w(TAG, "Failed to get peek info: " + peekInfo.getStatus()); diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/SignalCallLinkManager.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/SignalCallLinkManager.kt index 2f15e387d9..5ec9822b2d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/SignalCallLinkManager.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/SignalCallLinkManager.kt @@ -141,7 +141,8 @@ class SignalCallLinkManager( callManager.readCallLink( SignalStore.internal.groupCallingServer, requestCallLinkAuthCredentialPresentation(credentials.linkKeyBytes).serialize(), - CallLinkRootKey(credentials.linkKeyBytes) + CallLinkRootKey(credentials.linkKeyBytes), + null ) { if (it.isSuccess) { emitter.onSuccess(ReadCallLinkResult.Success(it.value!!.toAppState())) @@ -168,6 +169,7 @@ class SignalCallLinkManager( SignalStore.internal.groupCallingServer, credentialPresentation.serialize(), CallLinkRootKey(credentials.linkKeyBytes), + null, credentials.adminPassBytes, name ) { result -> @@ -195,6 +197,7 @@ class SignalCallLinkManager( SignalStore.internal.groupCallingServer, credentialPresentation.serialize(), CallLinkRootKey(credentials.linkKeyBytes), + null, credentials.adminPassBytes, restrictions ) { result -> @@ -221,6 +224,7 @@ class SignalCallLinkManager( SignalStore.internal.groupCallingServer, credentialPresentation.serialize(), CallLinkRootKey(credentials.linkKeyBytes), + null, credentials.adminPassBytes ) { result -> if (result.isSuccess && result.value == true) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 76dded12d8..3ea90167cb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -145,7 +145,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.52.3" +signal-ringrtc = "org.signal:ringrtc-android:2.53.0" signal-android-database-sqlcipher = "org.signal:sqlcipher-android:4.6.0-S1" # Third Party diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index e6af11f62d..7fcbfe9d08 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -7232,12 +7232,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + +