diff --git a/bin/dbus/configurationmanager-introspec.xml b/bin/dbus/configurationmanager-introspec.xml index 5b898cf7e15e04e56ae89385055bc6dbea2d8a1b..4b6cd1b994d9cd8f4e7a51cb3ae7475a1d2ae713 100644 --- a/bin/dbus/configurationmanager-introspec.xml +++ b/bin/dbus/configurationmanager-introspec.xml @@ -635,18 +635,6 @@ </arg> </method> - <method name="getTlsSettings" tp:name-for-bindings="getTlsSettings"> - <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/> - <arg type="a{ss}" name="details" direction="out"> - </arg> - </method> - - <method name="setTlsSettings" tp:name-for-bindings="setTlsSettings"> - <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="MapStringString"/> - <arg type="a{ss}" name="details" direction="in"> - </arg> - </method> - <method name="validateCertificate" tp:name-for-bindings="validateCertificate"> <arg type="s" name="accountId" direction="in"></arg> <arg type="s" name="certificatePath" direction="in"> diff --git a/bin/dbus/dbusconfigurationmanager.cpp b/bin/dbus/dbusconfigurationmanager.cpp index 3697a2947cf0032d2e7fd50e0b694f5d2022ebbe..3af2927c0bd0df43b7c2c9a6a8e0a946b9744c6a 100644 --- a/bin/dbus/dbusconfigurationmanager.cpp +++ b/bin/dbus/dbusconfigurationmanager.cpp @@ -364,12 +364,6 @@ DBusConfigurationManager::setHookSettings(const std::map<std::string, std::strin DRing::setHookSettings(settings); } -auto -DBusConfigurationManager::getTlsSettings() -> decltype(DRing::getTlsSettings()) -{ - return DRing::getTlsSettings(); -} - auto DBusConfigurationManager::validateCertificate(const std::string& accountId, const std::string& certificate, const std::string& privateKey) -> decltype(DRing::validateCertificate(accountId, certificate, privateKey)) { @@ -394,12 +388,6 @@ DBusConfigurationManager::getCertificateDetailsRaw(const std::vector<uint8_t>& c return DRing::getCertificateDetailsRaw(certificate); } -void -DBusConfigurationManager::setTlsSettings(const std::map<std::string, std::string>& details) -{ - DRing::setTlsSettings(details); -} - auto DBusConfigurationManager::getIp2IpDetails() -> decltype(DRing::getIp2IpDetails()) { diff --git a/bin/dbus/dbusconfigurationmanager.h b/bin/dbus/dbusconfigurationmanager.h index 3351b9e7f7fbb788975a2e3ab19dc8f3db776615..f85351f4fa258e81458d4fa408acd18668edc6e7 100644 --- a/bin/dbus/dbusconfigurationmanager.h +++ b/bin/dbus/dbusconfigurationmanager.h @@ -117,8 +117,6 @@ class DBusConfigurationManager : void setAccountsOrder(const std::string& order); std::map<std::string, std::string> getHookSettings(); void setHookSettings(const std::map<std::string, std::string>& settings); - std::map<std::string, std::string> getTlsSettings(); - void setTlsSettings(const std::map<std::string, std::string>& details); std::map<std::string, std::string> getIp2IpDetails(); std::vector<std::map<std::string, std::string>> getCredentials(const std::string& accountID); void setCredentials(const std::string& accountID, const std::vector<std::map<std::string, std::string>>& details); diff --git a/src/client/configurationmanager.cpp b/src/client/configurationmanager.cpp index 98be0b14c4479c05429e620495509aadc07440d8..c947b803cb82def6d179837fa08e48b206e07a2a 100644 --- a/src/client/configurationmanager.cpp +++ b/src/client/configurationmanager.cpp @@ -130,33 +130,6 @@ getTlsDefaultSettings() }; } -std::map<std::string, std::string> -getTlsSettings() -{ - auto account = ring::Manager::instance().getIP2IPAccount(); - if (auto sipaccount = static_cast<SIPAccount*>(account.get())) - return sipaccount->getTlsSettings(); - RING_ERR("Could not find IP2IP account"); - return std::map<std::string, std::string>(); -} - -void -setTlsSettings(const std::map<std::string, std::string>& details) -{ - auto account = ring::Manager::instance().getIP2IPAccount(); - if (auto sipaccount = static_cast<SIPAccount*>(account.get())) { - sipaccount->setTlsSettings(details); - ring::Manager::instance().saveConfig(); - // FIXME: inefficient api, don't pass details (not as ref nor copy) - // let client requiests them we needed. - ring::emitSignal<ConfigurationSignal::VolatileDetailsChanged>(account->getAccountID(), - details); - } - - RING_DBG("No valid account in set TLS settings"); - return; -} - 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 21716a26e7069a40a3ca7d20ecca190861f5cdda..952251a9c2f90ea28a896642f3a67ae5e4496a6e 100644 --- a/src/dring/configurationmanager_interface.h +++ b/src/dring/configurationmanager_interface.h @@ -111,8 +111,6 @@ void setAccountsOrder(const std::string& order); std::map<std::string, std::string> getHookSettings(); void setHookSettings(const std::map<std::string, std::string>& settings); -std::map<std::string, std::string> getTlsSettings(); -void setTlsSettings(const std::map<std::string, std::string>& details); std::map<std::string, std::string> getIp2IpDetails(); std::vector<std::map<std::string, std::string>> getCredentials(const std::string& accountID);