Fixed encryption icon not visible in some calls

This commit is contained in:
Sylvain Berfini 2020-06-08 11:49:58 +02:00
parent 61d1825a6a
commit 1f3321967f

View file

@ -49,7 +49,7 @@ class StatusViewModel : StatusViewModel() {
on: Boolean, on: Boolean,
authenticationToken: String authenticationToken: String
) { ) {
if (call.params.mediaEncryption == MediaEncryption.ZRTP && !call.authenticationTokenVerified) { if (call.currentParams.mediaEncryption == MediaEncryption.ZRTP && !call.authenticationTokenVerified) {
showZrtpDialogEvent.value = Event(call) showZrtpDialogEvent.value = Event(call)
} else { } else {
updateEncryptionInfo(call) updateEncryptionInfo(call)
@ -77,7 +77,7 @@ class StatusViewModel : StatusViewModel() {
if (currentCall != null) { if (currentCall != null) {
updateEncryptionInfo(currentCall) updateEncryptionInfo(currentCall)
if (currentCall.params.mediaEncryption == MediaEncryption.ZRTP && !currentCall.authenticationTokenVerified) { if (currentCall.currentParams.mediaEncryption == MediaEncryption.ZRTP && !currentCall.authenticationTokenVerified) {
showZrtpDialogEvent.value = Event(currentCall) showZrtpDialogEvent.value = Event(currentCall)
} }
} }
@ -91,7 +91,7 @@ class StatusViewModel : StatusViewModel() {
fun showZrtpDialog() { fun showZrtpDialog() {
val currentCall = coreContext.core.currentCall val currentCall = coreContext.core.currentCall
if (currentCall?.params?.mediaEncryption == MediaEncryption.ZRTP) { if (currentCall?.currentParams?.mediaEncryption == MediaEncryption.ZRTP) {
showZrtpDialogEvent.value = Event(currentCall) showZrtpDialogEvent.value = Event(currentCall)
} }
} }
@ -106,7 +106,7 @@ class StatusViewModel : StatusViewModel() {
return return
} }
when (call.params.mediaEncryption ?: MediaEncryption.None) { when (call.currentParams.mediaEncryption ?: MediaEncryption.None) {
MediaEncryption.SRTP, MediaEncryption.DTLS -> { MediaEncryption.SRTP, MediaEncryption.DTLS -> {
encryptionIcon.value = R.drawable.security_ok encryptionIcon.value = R.drawable.security_ok
encryptionIconVisible.value = true encryptionIconVisible.value = true