jabber: omemo: working on 4.3

proper dynamic caps implementation for omemo caps/features and for miranda caps/features in general as required by xep-0115
removed my old attempt to implement dynamic omemo cap
fixed few bugs in OmemoHandleDeviceList

1 files changed, 1 insertions, 18 deletions

diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp
index 071c841546..8393b4b964 100755
--- a/protocols/JabberG/src/jabber_opt.cpp
+++ b/protocols/JabberG/src/jabber_opt.cpp
@@ -848,24 +848,7 @@ public:
 				}

 			}

 		}

-		//dynamic caps

-		{

-			JabberCapsBits jcb = 0;

-			// set all bits occupied by g_JabberFeatCapPairs

-			for (int i = 0; g_JabberFeatCapPairs[i].szFeature; i++)

-				jcb |= g_JabberFeatCapPairs[i].jcbCap;

-

-			// set all bits already occupied by external plugins

-			for (int i = 0; i < m_proto->m_lstJabberFeatCapPairsDynamic.getCount(); i++)

-				jcb |= m_proto->m_lstJabberFeatCapPairsDynamic[i]->jcbCap;

-			if(m_proto->m_options.UseOMEMO)

-				jcb |= JABBER_CAPS_OMEMO_DEVICELIST_NOTIFY;

-			else

-				jcb &= ~JABBER_CAPS_OMEMO_DEVICELIST_NOTIFY;

-

-			m_proto->m_clientCapsManager.SetClientCaps(JABBER_CAPS_MIRANDA_NODE, szCoreVersion, jcb);

-		}

-

+		m_proto->m_clientCapsManager.UpdateFeatHash();

 		m_proto->SendPresence(m_proto->m_iStatus, true);

 	}