From a19e16a54149be09fb5913ac211577ce254f6b28 Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Thu, 9 Mar 2023 16:01:17 +0100 Subject: omemo: Fix usage of unexported symbols from Constants_p.h This adds the constants to files from the omemo module. It fixes the build of the omemo module on windows with MSVC (and potentially release builds on linux too). --- src/omemo/QXmppOmemoManager.cpp | 1 - src/omemo/QXmppOmemoManager_p.cpp | 10 +++++++++- src/omemo/QXmppOmemoManager_p.h | 5 +++++ 3 files changed, 14 insertions(+), 2 deletions(-) (limited to 'src/omemo') diff --git a/src/omemo/QXmppOmemoManager.cpp b/src/omemo/QXmppOmemoManager.cpp index f3137889..8af588d1 100644 --- a/src/omemo/QXmppOmemoManager.cpp +++ b/src/omemo/QXmppOmemoManager.cpp @@ -4,7 +4,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later #include "QXmppClient.h" -#include "QXmppConstants_p.h" #include "QXmppOmemoElement_p.h" #include "QXmppOmemoIq_p.h" #include "QXmppOmemoItems_p.h" diff --git a/src/omemo/QXmppOmemoManager_p.cpp b/src/omemo/QXmppOmemoManager_p.cpp index 9d2d41a2..f3b71545 100644 --- a/src/omemo/QXmppOmemoManager_p.cpp +++ b/src/omemo/QXmppOmemoManager_p.cpp @@ -7,7 +7,6 @@ #include "QXmppOmemoManager_p.h" -#include "QXmppConstants_p.h" #include "QXmppOmemoDeviceElement_p.h" #include "QXmppOmemoElement_p.h" #include "QXmppOmemoEnvelope_p.h" @@ -36,6 +35,15 @@ using Error = QXmppStanza::Error; using Manager = QXmppOmemoManager; using ManagerPrivate = QXmppOmemoManagerPrivate; +const char *ns_client = "jabber:client"; +const char *ns_pubsub_auto_create = "http://jabber.org/protocol/pubsub#auto-create"; +const char *ns_pubsub_config_node = "http://jabber.org/protocol/pubsub#config-node"; +const char *ns_pubsub_config_node_max = "http://jabber.org/protocol/pubsub#config-node-max"; +const char *ns_pubsub_create_and_configure = "http://jabber.org/protocol/pubsub#create-and-configure"; +const char *ns_pubsub_create_nodes = "http://jabber.org/protocol/pubsub#create-nodes"; +const char *ns_pubsub_publish = "http://jabber.org/protocol/pubsub#publish"; +const char *ns_pubsub_publish_options = "http://jabber.org/protocol/pubsub#publish-options"; + namespace QXmpp::Omemo::Private { const QString PAYLOAD_MESSAGE_AUTHENTICATION_CODE_TYPE = QStringLiteral("hmac(sha256)"); diff --git a/src/omemo/QXmppOmemoManager_p.h b/src/omemo/QXmppOmemoManager_p.h index 838e68ad..db488023 100644 --- a/src/omemo/QXmppOmemoManager_p.h +++ b/src/omemo/QXmppOmemoManager_p.h @@ -34,6 +34,11 @@ using namespace std::chrono_literals; namespace QXmpp::Omemo::Private { +// XMPP namespaces +constexpr auto ns_omemo_2 = "urn:xmpp:omemo:2"; +constexpr auto ns_omemo_2_bundles = "urn:xmpp:omemo:2:bundles"; +constexpr auto ns_omemo_2_devices = "urn:xmpp:omemo:2:devices"; + // default possible trust levels a key must have to be used for encryption // The class documentation must be adapted if the trust levels are modified. constexpr auto ACCEPTED_TRUST_LEVELS = TrustLevel::AutomaticallyTrusted | TrustLevel::ManuallyTrusted | TrustLevel::Authenticated; -- cgit v1.2.3