From 64d5a6708a00aaaaf8236a14e041910f29aa1ab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Wed, 2 Dec 2020 13:20:52 -0500
Subject: [PATCH] dring: remove unused getTlsDefaultSettings
Change-Id: I1173c7d3a5cc35dc28f3077404cdade6f08354f0
---
.../cx.ring.Ring.ConfigurationManager.xml | 6 ------
bin/dbus/dbusconfigurationmanager.cpp | 6 ------
bin/dbus/dbusconfigurationmanager.h | 1 -
bin/jni/configurationmanager.i | 2 --
bin/nodejs/configurationmanager.i | 2 --
src/client/configurationmanager.cpp | 20 -------------------
src/dring/configurationmanager_interface.h | 2 --
7 files changed, 39 deletions(-)
diff --git a/bin/dbus/cx.ring.Ring.ConfigurationManager.xml b/bin/dbus/cx.ring.Ring.ConfigurationManager.xml
index 7f6f1f44ea..5f166540a3 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 70f86c6b85..03ec74ef56 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 893424cdc3..5d640154f3 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 bb280fb3ac..4e20de4422 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 8633a7fccc..f091ba15f5 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 9fcbf0578a..c31ecae212 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 732ca1134a..b9f010144b 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);
--
GitLab