diff options
| author | Tor Lillqvist <tml@collabora.com> | 2023-04-24 13:01:50 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2023-04-24 17:15:47 +0300 |
| commit | bc6b3bbaeeb43238b666ef77f185b04a4bbcfabd (patch) | |
| tree | c72e1b61f3366eadaa9dfb6de876c2b8b31e49f9 /kit | |
| parent | Add close button to paste warning dialogues. (diff) | |
| download | online-bc6b3bbaeeb43238b666ef77f185b04a4bbcfabd.tar.gz online-bc6b3bbaeeb43238b666ef77f185b04a4bbcfabd.zip | |
Fix build for iOS (and possibly for Android)
Signed-off-by: Tor Lillqvist <tml@collabora.com>
Change-Id: I5eb5187b896b7e80aaab5660a8f10268b565dc8f
Diffstat (limited to 'kit')
| -rw-r--r-- | kit/ChildSession.cpp | 4 | ||||
| -rw-r--r-- | kit/Kit.cpp | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp index fc50b25d8c..6c8885a6b7 100644 --- a/kit/ChildSession.cpp +++ b/kit/ChildSession.cpp @@ -1170,7 +1170,9 @@ bool ChildSession::downloadAs(const StringVector& tokens) jailDoc = jailDoc.substr(0, jailDoc.find(JAILED_DOCUMENT_ROOT)) + JAILED_DOCUMENT_ROOT; } +#if !MOBILEAPP consistencyCheckJail(); +#endif // The file is removed upon downloading. const std::string tmpDir = FileUtil::createRandomDir(jailDoc); @@ -2570,7 +2572,9 @@ bool ChildSession::saveAs(const StringVector& tokens) // url is already encoded encodedURL = url; +#if !MOBILEAPP consistencyCheckJail(); +#endif std::string encodedWopiFilename; Poco::URI::encode(wopiFilename, "", encodedWopiFilename); diff --git a/kit/Kit.cpp b/kit/Kit.cpp index 843f4c0ba1..37c08bd5fe 100644 --- a/kit/Kit.cpp +++ b/kit/Kit.cpp @@ -1503,7 +1503,9 @@ private: const std::string& macroSecurityLevel = session->getMacroSecurityLevel(); const std::string& userTimezone = session->getTimezone(); +#if !MOBILEAPP consistencyCheckFileExists(uri); +#endif std::string options; if (!lang.empty()) @@ -3163,6 +3165,8 @@ void runKitLoopInAThread() #endif // !BUILDING_TESTS +#if !MOBILEAPP + void consistencyCheckJail() { static bool warned = false; @@ -3194,6 +3198,8 @@ void consistencyCheckJail() } } +#endif // !MOBILEAPP + std::string anonymizeUrl(const std::string& url) { #ifndef BUILDING_TESTS |