diff --git a/wsd/COOLWSD.cpp b/wsd/COOLWSD.cpp index 3edba4ba51..bf302f5210 100644 --- a/wsd/COOLWSD.cpp +++ b/wsd/COOLWSD.cpp @@ -16,7 +16,9 @@ #if ENABLE_FEATURE_LOCK #include "CommandControl.hpp" #endif -#include "HostUtil.hpp" +#if !MOBILEAPP +#include +#endif // !MOBILEAPP /* Default host used in the start test URI */ #define COOLWSD_TEST_HOST "localhost" diff --git a/wsd/ClientRequestDispatcher.cpp b/wsd/ClientRequestDispatcher.cpp index e19e70cda9..fdd005c451 100644 --- a/wsd/ClientRequestDispatcher.cpp +++ b/wsd/ClientRequestDispatcher.cpp @@ -25,7 +25,9 @@ #include #include #include +#if !MOBILEAPP #include +#endif // !MOBILEAPP #include #include #include @@ -382,8 +384,6 @@ getConvertToBrokerImplementation(const std::string& requestType, const std::stri return nullptr; } -#endif // !MOBILEAPP - bool ClientRequestDispatcher::allowPostFrom(const std::string& address) { static bool init = false; @@ -465,6 +465,8 @@ bool ClientRequestDispatcher::allowConvertTo(const std::string& address, return allow; } +#endif // !MOBILEAPP + void ClientRequestDispatcher::onConnect(const std::shared_ptr& socket) { _id = COOLWSD::GetConnectionId(); @@ -1884,10 +1886,17 @@ ClientRequestDispatcher::getCapabilitiesJson(const Poco::Net::HTTPRequest& reque // Can the convert-to be used? Poco::JSON::Object::Ptr convert_to = new Poco::JSON::Object; +#if !MOBILEAPP Poco::Dynamic::Var available = allowConvertTo(socket->clientAddress(), request); convert_to->set("available", available); if (available) convert_to->set("endpoint", "/cool/convert-to"); +#else + // convert-to is not supported on mobile apps as it requires wopi. + (void)request; + Poco::Dynamic::Var available = false; + convert_to->set("available", available); +#endif // MOBILEAPP Poco::JSON::Object::Ptr capabilities = new Poco::JSON::Object; capabilities->set("convert-to", convert_to); diff --git a/wsd/ClientRequestDispatcher.hpp b/wsd/ClientRequestDispatcher.hpp index 34964463d7..90c750764d 100644 --- a/wsd/ClientRequestDispatcher.hpp +++ b/wsd/ClientRequestDispatcher.hpp @@ -31,11 +31,6 @@ public: StaticFileContentCache["discovery.xml"] = getDiscoveryXML(); } - /// Does this address feature in the allowed hosts list. - static bool allowPostFrom(const std::string& address); - - static bool allowConvertTo(const std::string& address, const Poco::Net::HTTPRequest& request); - private: /// Set the socket associated with this ResponseClient. void onConnect(const std::shared_ptr& socket) override; @@ -52,6 +47,11 @@ private: void performWrites(std::size_t /*capacity*/) override {} #if !MOBILEAPP + /// Does this address feature in the allowed hosts list. + static bool allowPostFrom(const std::string& address); + + static bool allowConvertTo(const std::string& address, const Poco::Net::HTTPRequest& request); + void handleRootRequest(const RequestDetails& requestDetails, const std::shared_ptr& socket); diff --git a/wsd/HostUtil.cpp b/wsd/HostUtil.cpp index dedc87a847..9bb78fed53 100644 --- a/wsd/HostUtil.cpp +++ b/wsd/HostUtil.cpp @@ -9,7 +9,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "config.h" +#include + +// HostUtil is only used in non-mobile apps. +#if !MOBILEAPP #include "HostUtil.hpp" #include @@ -230,4 +233,6 @@ void HostUtil::setFirstHost(const Poco::URI& uri) } } +#endif // !MOBILEAPP + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/wsd/HostUtil.hpp b/wsd/HostUtil.hpp index 2ef64faf57..aceb215d7a 100644 --- a/wsd/HostUtil.hpp +++ b/wsd/HostUtil.hpp @@ -11,6 +11,9 @@ #pragma once +// HostUtil is only used in non-mobile apps. +#if !MOBILEAPP + #include #include #include @@ -56,5 +59,6 @@ private: /// add host to WopiHosts static void addWopiHost(const std::string& host, bool allow); }; +#endif // !MOBILEAPP /* vim:set shiftwidth=4 softtabstop=4 expandtab: */