Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 18:30:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to RingRTC v2.39.0

Browse Source 
Co-authored-by: Alex Hart <alex@signal.org>
This commit is contained in:
Jim Gustafson
2024-03-04 10:21:47 -08:00
committed by Alex Hart
parent 4035932340
commit 690608cdf3
15 changed files with 127 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/SignalCallLinkManager.kt
View File

@@ -171,7 +171,7 @@ class SignalCallLinkManager(
name
) { result ->
if (result.isSuccess) {
emitter.onSuccess(UpdateCallLinkResult.Success(result.value!!.toAppState()))
emitter.onSuccess(UpdateCallLinkResult.Update(result.value!!.toAppState()))
} else {
emitter.onSuccess(UpdateCallLinkResult.Failure(result.status))
}
@@ -198,7 +198,7 @@ class SignalCallLinkManager(
restrictions
) { result ->
if (result.isSuccess) {
emitter.onSuccess(UpdateCallLinkResult.Success(result.value!!.toAppState()))
emitter.onSuccess(UpdateCallLinkResult.Update(result.value!!.toAppState()))
} else {
emitter.onSuccess(UpdateCallLinkResult.Failure(result.status))
}
@@ -206,9 +206,8 @@ class SignalCallLinkManager(
}
}
fun updateCallLinkRevoked(
credentials: CallLinkCredentials,
revoked: Boolean
fun deleteCallLink(
credentials: CallLinkCredentials
): Single<UpdateCallLinkResult> {
if (credentials.adminPassBytes == null) {
return Single.just(UpdateCallLinkResult.NotAuthorized)
@@ -217,15 +216,14 @@ class SignalCallLinkManager(
return Single.create { emitter ->
val credentialPresentation = requestCallLinkAuthCredentialPresentation(credentials.linkKeyBytes)
callManager.updateCallLinkRevoked(
callManager.deleteCallLink(
SignalStore.internalValues().groupCallingServer(),
credentialPresentation.serialize(),
CallLinkRootKey(credentials.linkKeyBytes),
credentials.adminPassBytes,
revoked
credentials.adminPassBytes
) { result ->
if (result.isSuccess) {
emitter.onSuccess(UpdateCallLinkResult.Success(result.value!!.toAppState()))
if (result.isSuccess && result.value == true) {
emitter.onSuccess(UpdateCallLinkResult.Delete(credentials.roomId))
} else {
emitter.onSuccess(UpdateCallLinkResult.Failure(result.status))
}

6
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/UpdateCallLinkResult.kt
View File

@@ -9,10 +9,14 @@ package org.thoughtcrime.securesms.service.webrtc.links
* Result type for call link updates.
*/
sealed interface UpdateCallLinkResult {
data class Success(
data class Update(
val state: SignalCallLinkState
) : UpdateCallLinkResult
data class Delete(
val roomId: CallLinkRoomId
) : UpdateCallLinkResult
data class Failure(
val status: Short
) : UpdateCallLinkResult