diff --git a/bin/dbus/cx.ring.Ring.CallManager.xml b/bin/dbus/cx.ring.Ring.CallManager.xml index 96570c67904109c592dc72fa96821937b19df57a..b4d611fb85a709bbf4e5dd743a62a268aa7f44b9 100644 --- a/bin/dbus/cx.ring.Ring.CallManager.xml +++ b/bin/dbus/cx.ring.Ring.CallManager.xml @@ -807,23 +807,6 @@ </arg> </signal> - <method name="getDisplayNames" tp:name-for-bindings="getDisplayNames"> - <tp:added version="1.3.0"/> - <tp:docstring> - Get the display name of every participant in a given conference, or their number as a fallback. - </tp:docstring> - <arg type="s" name="confID" direction="in"> - <tp:docstring> - The conference ID. - </tp:docstring> - </arg> - <arg type="as" name="list" direction="out"> - <tp:docstring> - The list of the display names. - </tp:docstring> - </arg> - </method> - <method name="getParticipantList" tp:name-for-bindings="getParticipantList"> <tp:added version="0.9.7"/> <tp:docstring> diff --git a/bin/dbus/dbuscallmanager.cpp b/bin/dbus/dbuscallmanager.cpp index d711c8c3894db1ae148a6a1a0378b67c632eb16b..30fe21d08c3a13e7282aef137dafd31200f37fe2 100644 --- a/bin/dbus/dbuscallmanager.cpp +++ b/bin/dbus/dbuscallmanager.cpp @@ -252,13 +252,6 @@ DBusCallManager::getParticipantList(const std::string& confID) return DRing::getParticipantList(confID); } -auto -DBusCallManager::getDisplayNames(const std::string& confID) - -> decltype(DRing::getDisplayNames(confID)) -{ - return DRing::getDisplayNames(confID); -} - auto DBusCallManager::getConferenceId(const std::string& callID) -> decltype(DRing::getConferenceId(callID)) diff --git a/bin/dbus/dbuscallmanager.h b/bin/dbus/dbuscallmanager.h index 87a667eed699e11e8714bc9b886e278a0ea8f514..333dbf40a4e3359a7d767f46085ca04ab98e8bbc 100644 --- a/bin/dbus/dbuscallmanager.h +++ b/bin/dbus/dbuscallmanager.h @@ -97,7 +97,6 @@ public: bool unholdConference(const std::string& confID); std::vector<std::string> getConferenceList(); std::vector<std::string> getParticipantList(const std::string& confID); - std::vector<std::string> getDisplayNames(const std::string& confID); std::string getConferenceId(const std::string& callID); std::map<std::string, std::string> getConferenceDetails(const std::string& callID); bool startRecordedFilePlayback(const std::string& filepath); diff --git a/bin/jni/callmanager.i b/bin/jni/callmanager.i index 29358dce2e027fcf1e87942feb1faef18f6dd33f..0940865e2788633d852087e6298175d96c743efb 100644 --- a/bin/jni/callmanager.i +++ b/bin/jni/callmanager.i @@ -99,7 +99,6 @@ bool holdConference(const std::string& confID); bool unholdConference(const std::string& confID); std::vector<std::string> getConferenceList(); std::vector<std::string> getParticipantList(const std::string& confID); -std::vector<std::string> getDisplayNames(const std::string& confID); std::string getConferenceId(const std::string& callID); std::map<std::string, std::string> getConferenceDetails(const std::string& callID); std::vector<std::map<std::string, std::string>> getConferenceInfos(const std::string& confId); diff --git a/bin/nodejs/callmanager.i b/bin/nodejs/callmanager.i index cc663721071d8e2ad471165f066125be10d7a26f..b7a1b1ee7edb3f993a295454803a182c5ca55634 100644 --- a/bin/nodejs/callmanager.i +++ b/bin/nodejs/callmanager.i @@ -90,7 +90,6 @@ bool holdConference(const std::string& confID); bool unholdConference(const std::string& confID); std::vector<std::string> getConferenceList(); std::vector<std::string> getParticipantList(const std::string& confID); -std::vector<std::string> getDisplayNames(const std::string& confID); std::string getConferenceId(const std::string& callID); std::map<std::string, std::string> getConferenceDetails(const std::string& callID); std::vector<std::map<std::string, std::string>> getConferenceInfos(const std::string& confId); diff --git a/src/client/callmanager.cpp b/src/client/callmanager.cpp index 841327b131b2f92b500e5ecdc9c5882c09dd3a2d..cf84f8e98bfb162eb40507d959523fa408e335e1 100644 --- a/src/client/callmanager.cpp +++ b/src/client/callmanager.cpp @@ -262,12 +262,6 @@ getParticipantList(const std::string& confID) return jami::Manager::instance().getParticipantList(confID); } -std::vector<std::string> -getDisplayNames(const std::string& confID) -{ - return jami::Manager::instance().getDisplayNames(confID); -} - std::string getConferenceId(const std::string& callID) { diff --git a/src/conference.cpp b/src/conference.cpp index 4f809f5a5e71f9c7f3f07ad431ca3d99f932dc00..2c5c35eebb7112d04aa863902615fa0c7bdd692f 100644 --- a/src/conference.cpp +++ b/src/conference.cpp @@ -717,20 +717,6 @@ Conference::getParticipantList() const return participants_; } -std::vector<std::string> -Conference::getDisplayNames() const -{ - std::vector<std::string> result; - result.reserve(participants_.size()); - - for (const auto& p : participants_) { - auto details = Manager::instance().getCallDetails(p); - const auto tmp = details["DISPLAY_NAME"]; - result.emplace_back(tmp.empty() ? details["PEER_NUMBER"] : tmp); - } - return result; -} - bool Conference::toggleRecording() { diff --git a/src/conference.h b/src/conference.h index ce631b4df04a9504e3ea21ad28190924ffb97242..0a2b185240da84eb2b09d1a061a5c860c40179eb 100644 --- a/src/conference.h +++ b/src/conference.h @@ -288,11 +288,6 @@ public: */ const ParticipantSet& getParticipantList() const; - /** - * Get the display names or peer numbers for this conference - */ - std::vector<std::string> getDisplayNames() const; - /** * Start/stop recording toggle */ diff --git a/src/jami/callmanager_interface.h b/src/jami/callmanager_interface.h index 202e5914885d17e9b4d877199f881c232cb4a210..24f306de8ae2dfff18e158e96f0b46774a14c423 100644 --- a/src/jami/callmanager_interface.h +++ b/src/jami/callmanager_interface.h @@ -87,7 +87,6 @@ DRING_PUBLIC bool holdConference(const std::string& confID); DRING_PUBLIC bool unholdConference(const std::string& confID); DRING_PUBLIC std::vector<std::string> getConferenceList(); DRING_PUBLIC std::vector<std::string> getParticipantList(const std::string& confID); -DRING_PUBLIC std::vector<std::string> getDisplayNames(const std::string& confID); DRING_PUBLIC std::string getConferenceId(const std::string& callID); DRING_PUBLIC std::map<std::string, std::string> getConferenceDetails(const std::string& callID); DRING_PUBLIC std::vector<std::map<std::string, std::string>> getConferenceInfos( diff --git a/src/manager.cpp b/src/manager.cpp index 5f3a8237c281ea3f4ae7ba9c1d005fea127c7c2e..edd0427778f0ce0730a763297b5f7240fb1c8357 100644 --- a/src/manager.cpp +++ b/src/manager.cpp @@ -3195,15 +3195,6 @@ Manager::getConferenceList() const return map_utils::extractKeys(pimpl_->conferenceMap_); } -std::vector<std::string> -Manager::getDisplayNames(const std::string& confID) const -{ - if (auto conf = getConferenceFromID(confID)) - return conf->getDisplayNames(); - JAMI_WARN("Did not find conference %s", confID.c_str()); - return {}; -} - std::vector<std::string> Manager::getParticipantList(const std::string& confID) const { diff --git a/src/manager.h b/src/manager.h index b7b9b14e50ee4d0be25d674f421a32754c4d56b4..5accbd5461c833c26cc88b6d9f883fe5e7da2eb9 100644 --- a/src/manager.h +++ b/src/manager.h @@ -552,12 +552,6 @@ public: */ std::vector<std::string> getParticipantList(const std::string& confID) const; - /** - * Get a list of the display names for everyone in a conference - * @return std::vector<std::string> A list of display names - */ - std::vector<std::string> getDisplayNames(const std::string& confID) const; - std::string getConferenceId(const std::string& callID); /**