TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-31 05:46:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: update to utilise call ID

Browse Source
This commit is contained in:
Harris
2021-10-22 08:52:57 +11:00
parent 2b98485de7
commit 97de286896
7 changed files with 103 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libsession/src/main/java/org/session/libsession/messaging/messages/control/CallMessage.kt
View File

@@ -2,16 +2,18 @@ package org.session.libsession.messaging.messages.control
import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.utilities.Log
import java.util.*
class CallMessage(): ControlMessage() {
var type: SignalServiceProtos.CallMessage.Type? = null
var sdps: List<String> = listOf()
var sdpMLineIndexes: List<Int> = listOf()
var sdpMids: List<String> = listOf()
var callId: UUID? = null
override val isSelfSendValid: Boolean = false
override val ttl: Long = 5 * 60 * 1000
override val ttl: Long = 300000L // 30s
override fun isValid(): Boolean = super.isValid() && type != null
&& (!sdps.isNullOrEmpty() || type == SignalServiceProtos.CallMessage.Type.END_CALL)
@@ -19,17 +21,19 @@ class CallMessage(): ControlMessage() {
constructor(type: SignalServiceProtos.CallMessage.Type,
sdps: List<String>,
sdpMLineIndexes: List<Int>,
sdpMids: List<String>) : this() {
sdpMids: List<String>,
callId: UUID) : this() {
this.type = type
this.sdps = sdps
this.sdpMLineIndexes = sdpMLineIndexes
this.sdpMids = sdpMids
this.callId = callId
}
companion object {
const val TAG = "CallMessage"
fun endCall() = CallMessage(SignalServiceProtos.CallMessage.Type.END_CALL, emptyList(), emptyList(), emptyList())
fun endCall(callId: UUID) = CallMessage(SignalServiceProtos.CallMessage.Type.END_CALL, emptyList(), emptyList(), emptyList(), callId)
fun fromProto(proto: SignalServiceProtos.Content): CallMessage? {
val callMessageProto = if (proto.hasCallMessage()) proto.callMessage else return null
@@ -37,7 +41,8 @@ class CallMessage(): ControlMessage() {
val sdps = callMessageProto.sdpsList
val sdpMLineIndexes = callMessageProto.sdpMLineIndexesList
val sdpMids = callMessageProto.sdpMidsList
return CallMessage(type,sdps, sdpMLineIndexes, sdpMids)
val callId = UUID.fromString(callMessageProto.uuid)
return CallMessage(type,sdps, sdpMLineIndexes, sdpMids, callId)
}
}
@@ -52,6 +57,7 @@ class CallMessage(): ControlMessage() {
.addAllSdps(sdps)
.addAllSdpMLineIndexes(sdpMLineIndexes)
.addAllSdpMids(sdpMids)
.setUuid(callId!!.toString())
return SignalServiceProtos.Content.newBuilder()
.setCallMessage(
@@ -66,6 +72,7 @@ class CallMessage(): ControlMessage() {
other as CallMessage
if (callId != other.callId) return false
if (type != other.type) return false
if (sdps != other.sdps) return false
if (sdpMLineIndexes != other.sdpMLineIndexes) return false

4
libsession/src/main/java/org/session/libsession/messaging/utilities/WebRtcUtils.kt
View File

@@ -2,12 +2,12 @@ package org.session.libsession.messaging.utilities
import kotlinx.coroutines.channels.Channel
import org.session.libsession.messaging.messages.control.CallMessage
import org.session.libsession.utilities.Address
import java.util.*
object WebRtcUtils {
// TODO: move this to a better place that is persistent
val SIGNAL_QUEUE = Channel<CallMessage>(Channel.UNLIMITED)
val callCache: MutableMap<Address, MutableSet<CallMessage>> = mutableMapOf()
val callCache: MutableMap<UUID, MutableSet<CallMessage>> = mutableMapOf()
}