jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

dring: remove unused getTlsDefaultSettings

Browse Source 
Change-Id: I1173c7d3a5cc35dc28f3077404cdade6f08354f0
This commit is contained in:
Sébastien Blin
2020-12-02 13:20:52 -05:00
committed by Adrien Béraud
parent 36966f4c2a
commit 64d5a6708a
7 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/dbus/cx.ring.Ring.ConfigurationManager.xml
View File

@ -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">

6
bin/dbus/dbusconfigurationmanager.cpp
View File

@ -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())
{

1
bin/dbus/dbusconfigurationmanager.h
View File

@ -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();

2
bin/jni/configurationmanager.i
View File

@ -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);

2
bin/nodejs/configurationmanager.i
View File

@ -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);

20
src/client/configurationmanager.cpp
View File

@ -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)
{

2
src/dring/configurationmanager_interface.h
View File

@ -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);