diff --git a/bin/dbus/cx.ring.Ring.ConfigurationManager.xml b/bin/dbus/cx.ring.Ring.ConfigurationManager.xml index 8b39558b88bc12806bce7bc9bb753c6802fc7b61..eef6172df97835ba755077f7841bf657f67798e7 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 aea2a4d1d1f826213880dfe15192edfe837fff36..1e629f48649be1b299886a12fe4ad2de2a485181 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 c471fd08b88ec9c60c221a2f08931994b1187b6b..f2f0a3fcb1ad2ab390917555f11badaf1c4addc4 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 bb4fdef1e7c76d62f3dba47b74e8283280430f19..b02e43415293bc643a68af76b9528547aee80187 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 f810064121cbff33aac0633327adc6b1634b6d5b..83bc607a7e4b336b2a8ec7d4e78f457c7103b31e 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 ffde8589ce7b67ecf301e59b8bc1e553f0a5dc41..95f7b243705f49d3448b7dd02293314cc581caec 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 a085b45eff1b37dd364b95cb00ab4e7054f59549..6cbc79f6df6a08cb1e99331a7c289b424dc3b7a9 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 8daf9b722f8cafb1e0a41ad6cbc24f72e7f657ca..0548d499e0547f7cd86e436e13d4891748a9f7d7 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