omemo: working on 4.3

removed xep-0060 8.1.1 implementation because xep-0163 requires node auto-create support
reverted to "instand publish" logic instead of node precreation
//looks like we have some problems with pubsub events receiving	mechanism or client features publishing which
is blocker problem for continuing to work on omemo implementation.

1 files changed, 6 insertions, 9 deletions

diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp
index d9cd46f0c3..715c6344d3 100755
--- a/protocols/JabberG/src/jabber_iqid.cpp
+++ b/protocols/JabberG/src/jabber_iqid.cpp
@@ -52,6 +52,12 @@ void CJabberProto::OnIqResultServerDiscoInfo(HXML iqNode, CJabberIqInfo*)
 		if (!mir_wstrcmp(tmp.category, L"pubsub") && !mir_wstrcmp(tmp.type, L"pep")) {

 			m_bPepSupported = true;

 

+			if (m_options.UseOMEMO)

+			{

+				//publish ndes, precreation is not required

+				OmemoPublishNodes();

+			}

+

 			EnableMenuItems(true);

 			RebuildInfoFrame();

 			continue;

@@ -207,15 +213,6 @@ void CJabberProto::OnLoggedIn()
 	setString("LastLoggedServer", m_ThreadInfo->conn.server);

 	m_pepServices.ResetPublishAll();

 

-	if (m_options.UseOMEMO)

-	{

-		if (m_PubsubServiceName) // this is required if login server is changed only

-		{

-			mir_free(m_PubsubServiceName);

-			m_PubsubServiceName = nullptr;

-		}

-		OmemoCreateNodes();

-	}

 }

 

 void CJabberProto::OnIqResultGetAuth(HXML iqNode, CJabberIqInfo*)