From e1f3b48e36089eab79fe49ad31c2c9d7d1bd960c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Wed, 27 Jun 2018 10:49:58 -0400
Subject: [PATCH] account: force TLS.enable if using a Ring account
Change-Id: I4810eea915cd9def3db8516e3ba0f76a652e0f6b
Reviewed-by: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
---
src/newaccountmodel.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/newaccountmodel.cpp b/src/newaccountmodel.cpp
index 4e9bb6be..db122cef 100644
--- a/src/newaccountmodel.cpp
+++ b/src/newaccountmodel.cpp
@@ -540,7 +540,7 @@ account::Info::fromDetails(const MapStringString& details)
confProperties.SRTP.rtpFallback = toBool(details[ConfProperties::SRTP::RTP_FALLBACK]);
// TLS
confProperties.TLS.listenerPort = toInt(details[ConfProperties::TLS::LISTENER_PORT]);
- confProperties.TLS.enable = toBool(details[ConfProperties::TLS::ENABLED]);
+ confProperties.TLS.enable = details[ConfProperties::TYPE] == QString(ProtocolNames::RING)? true : toBool(details[ConfProperties::TLS::ENABLED]);
confProperties.TLS.port = toInt(details[ConfProperties::TLS::PORT]);
confProperties.TLS.certificateListFile = toStdString(details[ConfProperties::TLS::CA_LIST_FILE]);
confProperties.TLS.certificateFile = toStdString(details[ConfProperties::TLS::CERTIFICATE_FILE]);
--
GitLab