Commit Graph

78 Commits (3ba713aabf20279c5d83d039e5a7ac906b79c783)

Author SHA1 Message Date
Jaume Pujantell 3ba713aabf add isMobileApp util function to reduce ifdefs
Removed all MOBILEAPP preprocessor conditionals from Util.hpp/.cpp
Added isMobileApp function to help remove further conditionals.

Signed-off-by: Jaume Pujantell <jaume.pujantell@collabora.com>
Change-Id: I038a4db47ec2a2c7bb10f5696df5571b13bd9a61
2024-03-20 09:13:00 +01:00
Michael Meeks f406a8c901 ios: blind project file edit to include KitWebSocket.cpp.
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Change-Id: Id5f6287b20ad35a6505dfeace6a9cdcc9e551bc7
2024-03-06 20:56:55 -05:00
Ashod Nakashian 7570dd299c wsd: use RequestVettingStation for async loading
This replaces the synchronous loading logic
with the new asynchronous one.

Change-Id: I20fd7903cffbbd7c524d8051295113439ef75d5b
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2024-02-24 14:09:22 -05:00
Ashod Nakashian 5a82c36680 wsd: move ClientRequestDispatcher to own file
This moves ClientRequestDispatcher and all
its direct exclusive dependencies to its
own file and adjusts formatting.

No functional changes were performed,
although namespaces were restored and
other minor changes were done for
consistency.

The resulting file is still rather large
at around 2000 lines, but that makes
COOLWSD.cpp smaller by about 30% now.

Change-Id: I59bcd997ad08702ce7029c6791095e75ad9b23b0
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2024-02-21 20:13:39 -05:00
Aron Budea c0b65318f2 Bump baseline to C++20
Signed-off-by: Aron Budea <aron.budea@collabora.com>
Change-Id: I8201175e83eba549f22aaeb935cda46a712ec492
2024-02-21 18:28:47 +01:00
Jaume Pujantell 8f178ef6cd extract some functions to extra files for in process mode
Extract some functions from ForKit.cpp and COOLWSD.cpp to new files
so we can do a kit in process mode without using ifdef directives.

Signed-off-by: Jaume Pujantell <jaume.pujantell@collabora.com>
Change-Id: I7529f8f46a8026318244666b27d1ce72ed5ad4ca
2023-12-18 10:34:10 +00:00
Caolán McNamara 654cb1ae05 add DeltaSimd to android/iOS
Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Change-Id: Icad55a047ea505d81e50ae634e38d8301fb3b21e
2023-09-25 16:55:04 +01:00
Caolán McNamara ff2bd955c8 add Simd.[c|h]pp to ios build
Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Change-Id: I03971f023ba3bb7c51872fd4179da8b5fb8128a1
2023-09-25 16:55:04 +01:00
Patrick Luby 12213d7ec5 Fix iOS build breakages by adding http::Request to iOS build
Still needed to add a bunch of #if !MOBILAPP to disable all of the
Online server's unit testing classes so that the iOS app won't crash
when opening a document.

TODO: the iOS app will not accept text input at all. Is some code
unexpectedly consuming message data sent over the mobile fake socket?

Signed-off-by: Patrick Luby <plubius@neooffice.org>
Change-Id: Ie874ee8e452188a7b4cdf6d5f87708e5ed9b0235
2023-06-15 19:01:42 +01:00
Patrick Luby aad344f8a5 Suppress or fix all iOS compiler warnings without changing any code
Signed-off-by: Patrick Luby <plubius@neooffice.org>
Change-Id: I3a7693ad1d4a7b4873e462a26a9628454884c8c2
2023-05-16 09:43:29 +02:00
Patrick Luby 3bd8dd063f Modify the Info.plist to ensure that CFBundleVersion is always incremented
AppStoreConnect requires each upload, whether it is released or not, to be
higher than the previous successful upload's CFBundleVersion. So this
script sets the CFBundleVersion to the first and second components of
CFBundleShortVersionString and the UTC timestamp of when this script was
run is appended as the third component (or the second component if there
isn't a second component in CFBundleShortVersionString).

Signed-off-by: Patrick Luby <patrick.luby@collabora.com>
Change-Id: I90a667ed5634dc347eaff2fc0d8e83c3ea005d54
2023-02-20 21:32:10 +01:00
Patrick Luby 8cff1597fe Simplify iOS application test builds in Xcode
Replace leading "../" in absolute paths with "$(SOURCE_ROOT)/../" to avoid
the need to manually edit paths in the Xcode project file.

Also, all group files that have their group set to "path relative to group"
so replace all absolute paths in group files with the appropriate number
of leading "../" and replace "ios-device" in paths with "lobuilddir-symlink".

Lastly, verify that every file listed in the Xcode sidebar exists. A couple
dozen files in the core group have been moved or deleted in LibreOffice so
those were removed.

Signed-off-by: Patrick Luby <patrick.luby@collabora.com>
Change-Id: I09ef66273b049e75066e0a5b2589c80c93db0a77
2023-02-20 21:32:10 +01:00
Andras Timar a077c4288b Put all Zotero logic to browser
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Ib1b071b96322511b7f319ff6b851e902b3556fbb
2022-12-12 13:35:29 +01:00
Pranam Lashkari 2cfae369af initial zotero skeleton
add zotero UI only if user is logged in
when zotero citation edit button is clicked,
fetch the library with zotero API.
Let user select what to insert

at this stage its not a complete solution but just first stage

Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: Id67d8409bcd6416994713acd9ace495b24823fb0
2022-11-30 20:37:48 +01:00
Andras Timar 8561b98791 Fix build with libzstd on iOS
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Idb94f5d359593e6098b7386ce0a9d33126d8ec2d
2022-11-02 12:09:53 +01:00
Tor Lillqvist c6bd7f6818 Bump IPHONEOS_DEPLOYMENT_TARGET to match core:co-22.05
Signed-off-by: Tor Lillqvist <tml@collabora.com>
Change-Id: I15ba4ac4ccf56a1dbdfd0e7434d883625154c46c
2022-10-26 13:55:40 +02:00
Tor Lillqvist c3b76b4311 Define ENABLE_DEBUG in the iOS app Xcode project, not DEBUG
We don't have any ifdefs on DEBUG.

Signed-off-by: Tor Lillqvist <tml@collabora.com>
Change-Id: I76b4fe8ebbce235e967d8b5275fea663d3fb8f9d
2022-04-26 11:13:14 +03:00
Tor Lillqvist 46fff02d15 Make it possible again to open documents in this app from other apps like Mail
We keep open documents in the view controller stack. If you already
have one document loaded into this app, and then in Mail select an
attachment or in Files select a document to be opened in this app, it
will be loaded so that when you close it, you will be back editing the
earlier document.

Signed-off-by: Tor Lillqvist <tml@collabora.com>
Change-Id: I921907a2cbf8220a45b6dc0f304ba7eaec0befbc
2022-04-12 19:10:20 +03:00
Tor Lillqvist 32c1da2849 Add some more source files for debugging convenience
Signed-off-by: Tor Lillqvist <tml@collabora.com>
Change-Id: I2a2d7301cd9fa65bb96c2bf221f51fbc179d965e
2022-01-10 13:18:00 +02:00
Andras Timar f07ff8c7e0 rename: remaining lool->cool changes
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Ib7d4e804bebe52dead8d53b0e0bbaed0f08bf3d0
2021-11-18 14:14:11 +01:00
Henry Castro 2f4ee1944b ios: rename loleaflet -> browser
Change-Id: Ic279742b8032e8c57c8d49052a9b979287f847f7
Signed-off-by: Henry Castro <hcastro@collabora.com>
2021-11-10 17:18:56 +01:00
Henry Castro 9b3bdff3be rename loleaflet-help.html -> cool-help.html
Change-Id: I65933218dfa293caa6c83672c1fa484d9cce0638
Signed-off-by: Henry Castro <hcastro@collabora.com>
2021-11-10 17:18:56 +01:00
Henry Castro e0fe47be5f rename loleaflet.html -> cool.html
Change-Id: Iaa28f1269f8192755ec323396ae4ff054529f412
Signed-off-by: Henry Castro <hcastro@collabora.com>
2021-11-10 17:18:56 +01:00
Tor Lillqvist 7dd0364911 Bump IPHONEOS_DEPLOYMENT_TARGET to 13.6 to match core master
Signed-off-by: Tor Lillqvist <tml@collabora.com>
Change-Id: I7d2972882e89aaec60a9c4690e2e8cd1a83c4e72
2021-09-27 16:31:58 +03:00
Tor Lillqvist 8cef48a0fa Introduce a generic TraceEvent class and instant events here, too
Modelled on how it is done in core. ProfileZone is derived from
NamedEvent which is derived from TraceEvent. Here we don't keep any
separate ProfileZone.hpp, though.

This was needed to introduce generation of "instant" events here, too.

Signed-off-by: Tor Lillqvist <tml@collabora.com>
Change-Id: I6583134e96001641c50339deb4197fca6ab7d5d5
2021-06-02 09:04:21 +03:00
Tor Lillqvist 3553430a62 Try to fix iOS and Android build
Signed-off-by: Tor Lillqvist <tml@collabora.com>
Change-Id: I0839c589517f64d966fec9f247dda4163bdbe5fd
2021-05-31 10:56:19 +03:00
Tor Lillqvist 73943230d2 Fix build for iOS
Change-Id: I774e8802d959eefecd9863edd693f26f0fd1d863
Signed-off-by: Tor Lillqvist <tml@collabora.com>
2021-05-19 13:33:26 +03:00
Tor Lillqvist f60f3945d9 Add some more source files for breakpointing convenience
Change-Id: Iba566d62bb65e7b63d8125710fc1371de5df02fc
Signed-off-by: Tor Lillqvist <tml@collabora.com>
2021-04-06 22:17:35 +02:00
Tor Lillqvist e142d26a2f Don't use CollaboraOnlineWebViewKeyboardManager after all
Unclear whether it is actually useful or not any longer. Quite
possibly cross-platform changes in the JavaScript since
CollaboraOnlineWebViewKeyboardManager was introduced have fixed the
problems that it was solving.

Fixes https://github.com/CollaboraOnline/online/issues/1432

Change-Id: Ifa000d0a7d0a3dc87527536719063b368266f038
Signed-off-by: Tor Lillqvist <tml@collabora.com>
2021-03-08 14:00:38 +02:00
Tor Lillqvist 4bca8ea734 Add source files from sc/source/ui/docshell for breakpointing convenience
Change-Id: I9a4f4ff361c987de23dd376b4947ea054a82e6d8
2021-01-24 20:13:09 +01:00
Tor Lillqvist 6507b8b3fe Fix warning: MobileCoreServices has been renamed to CoreServices
Change-Id: I352a4a00c6ad0e80a6769a93fe6f5999aadf3128
Signed-off-by: Tor Lillqvist <tml@collabora.com>
(cherry picked from commit 5b598f13c7)
2020-11-05 23:42:39 +02:00
Tor Lillqvist 471dad998c Bump iOS deployment target to 13.0
Upcoming changes will introduce use of APIs that require iOS 13.

Change-Id: Idd4b1e1235ca7ab19eea8aa58f72784b946d50f8
Signed-off-by: Tor Lillqvist <tml@collabora.com>
(cherry picked from commit fcdc3b2f89)
2020-11-05 23:42:39 +02:00
Tor Lillqvist a8bee952f2 Add source files from toolkit/source/awt for debugging goodness
Change-Id: I3e912221d6acf4712602ed11e3575d5ed8af6ca7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103705
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103712
2020-09-30 19:06:45 +02:00
Tor Lillqvist 9b4d246366 Compile C++ for the iOS app as C++17
Needed by headers in core:master now.

Change-Id: I997bcf267ffd74479c04d83c8703e7f520046aa2
2020-09-23 00:02:38 +03:00
Tor Lillqvist 233cc39cf8 Link with the system libsqlite3 (for nss)
Change-Id: I889e87bd288fdf9e4d9f0a02033ef7cd14e5135b
2020-09-22 12:06:04 +03:00
Tor Lillqvist 2a8db1b5ab Use CollaboraOnlineWebViewKeyboardManager
For now, just copy its source files here. When/if I figure out what is
the appropriate way to package that framework for use in other
products (like the Collabora Office iOS app) I will use that instead.

Change-Id: If808f96b6a72c80e54dc84fce80a551503c96335
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101268
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-08-25 13:41:20 +02:00
Tor Lillqvist 14d98c6181 Add a bunch of source files from vcl for breakpointing convenience
Change-Id: I4730ecda8ab7b05fd46b8568dc750d85a8ffa804
2020-07-23 14:04:43 +03:00
Tor Lillqvist 6971cf578d Add Authorization.cpp and hpp
Surely no point in using that code for the iOS app, though. Hopefullly
eventually some clean way to bypass it wil emerge. Note that this is
just one step towards making the iOS app even build again.

Change-Id: Ia5a8e31fc6195394f02cbf43f2b5291bcfbb398d
2020-07-01 13:02:54 +03:00
Tor Lillqvist 7f25109f72 tdf#128502: Chunk of work to enable "multi-tasking" in the iOS app
Seems to not cause any serious regressions in the iOS app or in "make
run", but of course I am not able to run a comprehensive check of all
functionality.

Change-Id: I44a0e8d60bdbc0a885db88475961575c5e95ce88
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93037
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-06-26 13:09:51 +02:00
Tor Lillqvist 56afddaba0 Add RequestDetails.cpp and hpp
Change-Id: I084ce2e731073ab69a806d5053c27987b2a8244c
2020-05-15 23:34:01 +03:00
Tor Lillqvist 459cdc9c73 Add source files from framework/source/services
Change-Id: Ic1d905dfbb65d42da577a3d536742ad7c3893db3
2020-05-07 13:44:42 +03:00
Tor Lillqvist c05f7a4ad0 Argh, had forgotten to commit the s/Document/CODocument/ in the project file
Change-Id: I795d78cddbfbca2d9df17a662ec4800c40b68ace
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91742
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-04-06 12:54:28 +02:00
Jan Holesovsky 9978752258 mobile detection: Create a separate device-*.css for the phone/tablet/desktop.
The problem is that the @media-based detection often disagrees with the
JS-based detection which then leads to many problems - most notably that
part of the UI behaves as if it was a tablet, and the other part as if
was a mobile phone, leading to a terrible user experience.

This commit changes it so that there is only one way how to detect if
we are on mobile phone, tablet or desktop: using the JavaScript, and we
will load the appropriate css accordingly.

Only one @media-based rule is converted as an example, the rest will
follow.

Change-Id: Id7bfb58ca12264904b3329db1542ae6b54893f11
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91416
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-03-31 20:31:49 +02:00
Tor Lillqvist c6573a08d2 Add StringVector.{cpp,hpp}
Change-Id: I568d4136824fe0b4fcdd0f4bccd15a7c15a5248b
2020-03-10 14:17:31 +02:00
Tor Lillqvist 3de577d2c2 Use the loolkitconfig-mobile.xcu on iOS, too
We can't rename a file in the Xcode project, so copy it to
ios/Mobile/loolkitconfig.xcu in the configure script, and use from
there.

Change-Id: I1e50235c06f528dd24d0d968aaccc994418b57d8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89466
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-02-25 21:40:03 +01:00
Michael Meeks 6bdf561049 Share the Kit environment setup code.
Particularly configuration layers so we can tweak mobile config
easily.

Add core source files from configmgr for breakpointing convenience in
the iOS project. Add loolkitconfig.xcu to the iOS app bundle. Use
${BRAND_BASE_DIR} instead of a compile-time LOOLWSD_CONFIGDIR literal
on iOS (because there is no compile-time constant path to the app
bundle). No "registry" directory directly in the app bundle any longer
on iOS, a corresponding change in core.git moved that stuff to be
under "share", like on other platforms.

Change-Id: I6672efc0505abf27297c4758118a20992b10ceb3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88765
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2020-02-17 14:49:06 +01:00
Tor Lillqvist 0e797eeb3f Add some more core source files for breakpointing convenience
Change-Id: I829534011e037aac1297a41cdb0e6bf008e1b28b
2020-02-07 09:57:53 +02:00
Tor Lillqvist cad472f796 Add some more core source files for breakpointing convenience
Change-Id: Ia0f08bca84d98f45484162017bd3019876ab8604
2020-01-27 10:52:29 +02:00
Tor Lillqvist d39a9f84d5 Add sources in sd/source/ui/slidesorter/view for breakpointing convenience
Change-Id: I1f8919f86b64dd6a9f6befec90b13956b2b845d3
2020-01-22 13:39:55 +02:00
Tor Lillqvist 7254183877 Add some source files from sd for easier breakpointing
Change-Id: I2797b8fb8fbeebe73b6536a27733ad5fe2123d50
2020-01-14 13:21:04 +02:00