From c0aa6483c6a4ce7bb7edd684acd1f8c2a9157bae 2018-02-01 18:57:16 From: Vitaly Takmazov Date: 2018-02-01 18:57:16 Subject: [PATCH] Remote Roster ProtoXEP -> XEP-0321 or XEP-0356 --- diff --git a/include/transport/RosterManager.h b/include/transport/RosterManager.h index 7a460126f26a3845b0e875865e3c0ee5912c3993..46efbdbba899cc82578d0dc37435c8e3e2da4a1f 100644 --- a/include/transport/RosterManager.h +++ b/include/transport/RosterManager.h @@ -60,7 +60,7 @@ class RosterManager { /// Associates the buddy with this roster, /// and if the buddy is not already in XMPP user's server-side roster, the proper requests /// are sent to XMPP user (subscribe presences, Roster Item Exchange stanza or - /// the buddy is added to server-side roster using remote-roster protoXEP). + /// the buddy is added to server-side roster using XEP-0321 or XEP-0356). /// \param buddy Buddy void setBuddy(Buddy *buddy); diff --git a/spectrum/src/frontends/xmpp/XMPPRosterManager.cpp b/spectrum/src/frontends/xmpp/XMPPRosterManager.cpp index f3ccf309ddae6e6aa2a83dbcb69acbf71edc5e27..8992efb7cfdd683b4805e9d6fc61d1b8868beac0 100644 --- a/spectrum/src/frontends/xmpp/XMPPRosterManager.cpp +++ b/spectrum/src/frontends/xmpp/XMPPRosterManager.cpp @@ -198,11 +198,11 @@ void XMPPRosterManager::handleRemoteRosterResponse(SWIFTEN_SHRPTR_NAMESPACE::sha m_remoteRosterRequest.reset(); if (error) { m_supportRemoteRoster = false; - LOG4CXX_INFO(logger, m_user->getJID().toString() << ": This server does not support remote roster protoXEP"); + LOG4CXX_INFO(logger, m_user->getJID().toString() << ": This server does not allow us to modify your roster, consider enabling XEP-0321 or XEP-0356 support"); return; } - LOG4CXX_INFO(logger, m_user->getJID().toString() << ": This server supports remote roster protoXEP"); + LOG4CXX_INFO(logger, m_user->getJID().toString() << ": Roster modification is allowed"); m_supportRemoteRoster = true; //If we receive empty RosterPayload on login (not register) initiate full RosterPush