From d183be88495ac2c73527be7d91bcc88a0ff7b2b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Tue, 27 Apr 2021 11:03:51 -0400
Subject: [PATCH] manager: remove unused testAccountICEInitialization
Change-Id: I44e0d15482a72bee7f30b5740d99cc84bf22bca5
---
.../cx.ring.Ring.ConfigurationManager.xml | 19 --------------
bin/dbus/dbusconfigurationmanager.cpp | 7 ------
bin/dbus/dbusconfigurationmanager.h | 1 -
src/client/configurationmanager.cpp | 6 -----
src/dring/account_const.h | 5 ----
src/dring/configurationmanager_interface.h | 2 --
src/manager.cpp | 25 -------------------
src/manager.h | 2 --
8 files changed, 67 deletions(-)
diff --git a/bin/dbus/cx.ring.Ring.ConfigurationManager.xml b/bin/dbus/cx.ring.Ring.ConfigurationManager.xml
index 8b39558b88..eef6172df9 100644
--- a/bin/dbus/cx.ring.Ring.ConfigurationManager.xml
+++ b/bin/dbus/cx.ring.Ring.ConfigurationManager.xml
@@ -456,25 +456,6 @@
</arg>
</signal>
- <method name="testAccountICEInitialization" tp:name-for-bindings="testAccountICEInitialization">
- <tp:docstring>
- Test initializing an ICE transport with the current account configuration.
- </tp:docstring>
- <arg type="s" name="accountID" direction="in">
- </arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
- <arg type="a{ss}" name="result" direction="out" tp:type="String_String_Map">
- <tp:docstring>
- A string map.
- Available attributes:
- <ul>
- <li>STATUS: 0 for success, non-0 for error</li>
- <li>MESSAGE: message explaining the status</li>
- </ul>
- </tp:docstring>
- </arg>
- </method>
-
<method name="setAccountsOrder" tp:name-for-bindings="setAccountsOrder">
<tp:docstring>
Update the accounts order.
diff --git a/bin/dbus/dbusconfigurationmanager.cpp b/bin/dbus/dbusconfigurationmanager.cpp
index aea2a4d1d1..1e629f4864 100644
--- a/bin/dbus/dbusconfigurationmanager.cpp
+++ b/bin/dbus/dbusconfigurationmanager.cpp
@@ -48,13 +48,6 @@ DBusConfigurationManager::setAccountDetails(const std::string& accountID,
DRing::setAccountDetails(accountID, details);
}
-auto
-DBusConfigurationManager::testAccountICEInitialization(const std::string& accountID)
- -> decltype(DRing::testAccountICEInitialization(accountID))
-{
- return DRing::testAccountICEInitialization(accountID);
-}
-
void
DBusConfigurationManager::setAccountActive(const std::string& accountID, const bool& active)
{
diff --git a/bin/dbus/dbusconfigurationmanager.h b/bin/dbus/dbusconfigurationmanager.h
index c471fd08b8..f2f0a3fcb1 100644
--- a/bin/dbus/dbusconfigurationmanager.h
+++ b/bin/dbus/dbusconfigurationmanager.h
@@ -73,7 +73,6 @@ public:
std::map<std::string, std::string> getAccountDetails(const std::string& accountID);
std::map<std::string, std::string> getVolatileAccountDetails(const std::string& accountID);
void setAccountDetails(const std::string& accountID, const std::map<std::string, std::string>& details);
- std::map<std::string, std::string> testAccountICEInitialization(const std::string& accountID);
void setAccountActive(const std::string& accountID, const bool& active);
std::map<std::string, std::string> getAccountTemplate(const std::string& accountType);
void monitor(const bool& continuous);
diff --git a/src/client/configurationmanager.cpp b/src/client/configurationmanager.cpp
index bb4fdef1e7..b02e434152 100644
--- a/src/client/configurationmanager.cpp
+++ b/src/client/configurationmanager.cpp
@@ -90,12 +90,6 @@ getVolatileAccountDetails(const std::string& accountID)
return jami::Manager::instance().getVolatileAccountDetails(accountID);
}
-std::map<std::string, std::string>
-testAccountICEInitialization(const std::string& accountID)
-{
- return jami::Manager::instance().testAccountICEInitialization(accountID);
-}
-
std::map<std::string, std::string>
validateCertificate(const std::string&, const std::string& certificate)
{
diff --git a/src/dring/account_const.h b/src/dring/account_const.h
index f810064121..83bc607a7e 100644
--- a/src/dring/account_const.h
+++ b/src/dring/account_const.h
@@ -71,11 +71,6 @@ enum class MessageStates : int {
CANCELLED
}; // DRing::Account::MessageStates
-enum class testAccountICEInitializationStatus : int {
- SUCCESS = 0,
- FAILURE = 1
-}; // DRING:Account::testAccountICEInitializationStatus
-
namespace VolatileProperties {
constexpr static const char ACTIVE[] = "Account.active";
diff --git a/src/dring/configurationmanager_interface.h b/src/dring/configurationmanager_interface.h
index ffde8589ce..95f7b24370 100644
--- a/src/dring/configurationmanager_interface.h
+++ b/src/dring/configurationmanager_interface.h
@@ -58,8 +58,6 @@ DRING_PUBLIC std::map<std::string, std::string> getVolatileAccountDetails(
const std::string& accountID);
DRING_PUBLIC void setAccountDetails(const std::string& accountID,
const std::map<std::string, std::string>& details);
-DRING_PUBLIC std::map<std::string, std::string> testAccountICEInitialization(
- const std::string& accountID);
DRING_PUBLIC void setAccountActive(const std::string& accountID, bool active);
DRING_PUBLIC std::map<std::string, std::string> getAccountTemplate(const std::string& accountType);
DRING_PUBLIC std::string addAccount(const std::map<std::string, std::string>& details);
diff --git a/src/manager.cpp b/src/manager.cpp
index a085b45eff..6cbc79f6df 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -2822,31 +2822,6 @@ Manager::setAccountDetails(const std::string& accountID,
});
}
-std::map<std::string, std::string>
-Manager::testAccountICEInitialization(const std::string& accountID)
-{
- const auto account = getAccount(accountID);
- const auto transportOptions = account->getIceOptions();
-
- auto& iceTransportFactory = Manager::instance().getIceTransportFactory();
- std::shared_ptr<IceTransport> ice
- = iceTransportFactory.createTransport(accountID.c_str(), 4, true, account->getIceOptions());
-
- std::map<std::string, std::string> result;
-
- if (ice->waitForInitialization(ICE_INIT_TIMEOUT) <= 0) {
- result["STATUS"] = std::to_string(
- (int) DRing::Account::testAccountICEInitializationStatus::FAILURE);
- result["MESSAGE"] = ice->getLastErrMsg();
- } else {
- result["STATUS"] = std::to_string(
- (int) DRing::Account::testAccountICEInitializationStatus::SUCCESS);
- result["MESSAGE"] = "";
- }
-
- return result;
-}
-
std::string
Manager::getNewAccountId()
{
diff --git a/src/manager.h b/src/manager.h
index 8daf9b722f..0548d499e0 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -533,8 +533,6 @@ public:
void setAccountActive(const std::string& accountID, bool active);
- std::map<std::string, std::string> testAccountICEInitialization(const std::string& accountID);
-
/**
* Return a new random accountid that is not present in the list
* @return A brand new accountid
--
GitLab