diff --git a/bin/dbus/cx.ring.Ring.ConfigurationManager.xml b/bin/dbus/cx.ring.Ring.ConfigurationManager.xml index 7f6f1f44eabe25b527b4f92edb66bc796f1810d5..5f166540a3518a51cb85a68fe9bb795f1fee0381 100644 --- a/bin/dbus/cx.ring.Ring.ConfigurationManager.xml +++ b/bin/dbus/cx.ring.Ring.ConfigurationManager.xml @@ -1202,12 +1202,6 @@ </arg> </method> - <method name="getTlsDefaultSettings" tp:name-for-bindings="getTlsDefaultSettings"> - <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/> - <arg type="a{ss}" name="details" direction="out"> - </arg> - </method> - <method name="validateCertificate" tp:name-for-bindings="validateCertificate"> <arg type="s" name="accountId" direction="in"></arg> <arg type="s" name="certificate" direction="in"> diff --git a/bin/dbus/dbusconfigurationmanager.cpp b/bin/dbus/dbusconfigurationmanager.cpp index 70f86c6b85a98116a3402590e0006a266e2ebb07..03ec74ef56188ab8835fd394ed1e87fb0e410f2a 100644 --- a/bin/dbus/dbusconfigurationmanager.cpp +++ b/bin/dbus/dbusconfigurationmanager.cpp @@ -204,12 +204,6 @@ DBusConfigurationManager::setMessageDisplayed(const std::string& accountID, cons return DRing::setMessageDisplayed(accountID, contactId, messageId, status); } -auto -DBusConfigurationManager::getTlsDefaultSettings() -> decltype(DRing::getTlsDefaultSettings()) -{ - return DRing::getTlsDefaultSettings(); -} - auto DBusConfigurationManager::getCodecList() -> decltype(DRing::getCodecList()) { diff --git a/bin/dbus/dbusconfigurationmanager.h b/bin/dbus/dbusconfigurationmanager.h index 893424cdc3e9df6d1c4b018391c5fce1389f4554..5d640154f3b266f37f81be51a5b17725006c4188 100644 --- a/bin/dbus/dbusconfigurationmanager.h +++ b/bin/dbus/dbusconfigurationmanager.h @@ -91,7 +91,6 @@ class DRING_PUBLIC DBusConfigurationManager : bool cancelMessage(const std::string& accountID, const uint64_t& messageId); void setIsComposing(const std::string& accountID, const std::string& to, const bool& isWriting); bool setMessageDisplayed(const std::string& accountID, const std::string& contactId, const std::string& messageId, const int32_t& status); - std::map<std::string, std::string> getTlsDefaultSettings(); std::vector<std::string> getSupportedCiphers(const std::string& accountID); std::vector<unsigned> getCodecList(); std::vector<std::string> getSupportedTlsMethod(); diff --git a/bin/jni/configurationmanager.i b/bin/jni/configurationmanager.i index bb280fb3aceef7dc6ab58c4582bbb20b06bb6144..4e20de44224445a0e8df655e2e55daaa475fdd62 100644 --- a/bin/jni/configurationmanager.i +++ b/bin/jni/configurationmanager.i @@ -105,8 +105,6 @@ bool lookupAddress(const std::string& account, const std::string& nameserver, co bool registerName(const std::string& account, const std::string& password, const std::string& name); bool searchUser(const std::string& account, const std::string& query); -std::map<std::string, std::string> getTlsDefaultSettings(); - std::vector<unsigned> getCodecList(); std::vector<std::string> getSupportedTlsMethod(); std::vector<std::string> getSupportedCiphers(const std::string& accountID); diff --git a/bin/nodejs/configurationmanager.i b/bin/nodejs/configurationmanager.i index 8633a7fccc1983796db398525f0ea6a1051bbc13..f091ba15f586754501b4c726123de7a1e35ef933 100644 --- a/bin/nodejs/configurationmanager.i +++ b/bin/nodejs/configurationmanager.i @@ -96,8 +96,6 @@ bool lookupAddress(const std::string& account, const std::string& nameserver, co bool registerName(const std::string& account, const std::string& password, const std::string& name); bool searchUser(const std::string& account, const std::string& query); -std::map<std::string, std::string> getTlsDefaultSettings(); - std::vector<unsigned> getCodecList(); std::vector<std::string> getSupportedTlsMethod(); std::vector<std::string> getSupportedCiphers(const std::string& accountID); diff --git a/src/client/configurationmanager.cpp b/src/client/configurationmanager.cpp index 9fcbf0578a7758dcc90e6f30b5146c8ba872ce52..c31ecae212bedce25e36d1001d3c5122cd0d38e1 100644 --- a/src/client/configurationmanager.cpp +++ b/src/client/configurationmanager.cpp @@ -96,26 +96,6 @@ testAccountICEInitialization(const std::string& accountID) return jami::Manager::instance().testAccountICEInitialization(accountID); } -std::map<std::string, std::string> -getTlsDefaultSettings() -{ - std::stringstream portstr; - portstr << jami::sip_utils::DEFAULT_SIP_TLS_PORT; - - return {{jami::Conf::CONFIG_TLS_LISTENER_PORT, portstr.str()}, - {jami::Conf::CONFIG_TLS_CA_LIST_FILE, ""}, - {jami::Conf::CONFIG_TLS_CERTIFICATE_FILE, ""}, - {jami::Conf::CONFIG_TLS_PRIVATE_KEY_FILE, ""}, - {jami::Conf::CONFIG_TLS_PASSWORD, ""}, - {jami::Conf::CONFIG_TLS_METHOD, "Default"}, - {jami::Conf::CONFIG_TLS_CIPHERS, ""}, - {jami::Conf::CONFIG_TLS_SERVER_NAME, ""}, - {jami::Conf::CONFIG_TLS_VERIFY_SERVER, "true"}, - {jami::Conf::CONFIG_TLS_VERIFY_CLIENT, "true"}, - {jami::Conf::CONFIG_TLS_REQUIRE_CLIENT_CERTIFICATE, "true"}, - {jami::Conf::CONFIG_TLS_NEGOTIATION_TIMEOUT_SEC, "2"}}; -} - std::map<std::string, std::string> validateCertificate(const std::string&, const std::string& certificate) { diff --git a/src/dring/configurationmanager_interface.h b/src/dring/configurationmanager_interface.h index 732ca1134a2b6fdfa52f9d99de11b7eec3ad3c8e..b9f010144bbde40af62c91967816235b97debc0f 100644 --- a/src/dring/configurationmanager_interface.h +++ b/src/dring/configurationmanager_interface.h @@ -109,8 +109,6 @@ DRING_PUBLIC bool setMessageDisplayed(const std::string& accountID, const std::string& messageId, int status); -DRING_PUBLIC std::map<std::string, std::string> getTlsDefaultSettings(); - DRING_PUBLIC std::vector<unsigned> getCodecList(); DRING_PUBLIC std::vector<std::string> getSupportedTlsMethod(); DRING_PUBLIC std::vector<std::string> getSupportedCiphers(const std::string& accountID);