Commit graph

225 commits

Author SHA1 Message Date
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
e64bbeb819 Pass rendered tiles as uncompressed BMP files in the iOS app
Avoids the need for PNG encoding (takes significant amount of CPU
time) and Base64 encoding in the app process, transfer to JavaScript
(running in a WebKit process of its own), and corresponding decoding
(in the WebKit process). Instead simply pass the URL of each tile file
to the JavaScript. Remove each BMP file once it has been loaded.

Change-Id: I6e7b9450691679c64813979976c59f1763ec104c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98710
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2020-07-14 17:00:35 +02:00
Tor Lillqvist
ef7e79a20b Use LOG_INF_NOFILE() for the FakeSocket logging callbacks
(Why not call LOG_INF directly in FakeSocket.cpp instead? Good
question. I guess my idea was originally to keep FakeSocket separately
testable without all the Online logging stuff.)

Change-Id: I1e6b730a9742ad653d431774d88fec6a36d98850
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98736
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-07-14 16:55:12 +02:00
Tor Lillqvist
ea4a657573 Use a separate temp directory for each document during the iOS app lifetime
This prevents an assertion failure when you quickly open the same
document again after closing it.

Change-Id: I26b8c53d57bd1d33f0473a3c5a332ec02c37455d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98263
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-07-07 16:01:19 +02:00
Tor Lillqvist
3edc4d2201 Move the setupKitEnvironment() function into a file of its own
A small re-factoring to help planned re-plumbing of the iOS app.

Change-Id: I21f09216a7c5adf965179765a75f5a0d521cd7f3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97771
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-07-03 08:40:49 +02:00
Tor Lillqvist
4a4c5eb7a8 Update the first step
Won't bother with renaming the Objective-C classes I think, just to
keep changes minimal.

Change-Id: I683479fc32275a5ee2a1bc9c28275bc887c42474
2020-07-02 15:40:00 +03:00
Tor Lillqvist
38ea7a44b7 Add musings about a "second generation" of the iOS app 2020-07-01 15:48:44 +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
99c96aa263 Add USER_INTERFACE_MODE here, too
Change-Id: Ib029847ba70f709abbb5e2d9d8361b50289523dd
2020-07-01 12:49:20 +03:00
Szymon Kłos
11965d083e notebookbar: early init
- read settings from loolwsd.xml
- in case of notebookbar activated send :notebookbar parameter
- for mobile apps I left empty parameter in setupKitEnvironment calls

Change-Id: I5813589564b37eecc1e77c5d0eb737eca5f92f04
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97233
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-06-30 08:15:25 +02: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
9c517608be Bump the internal iOS app version to 4.2.6
Build 4.2.5 (57) was released (as 4.2.4).

Change-Id: I76a49b7851c2d8fa68f623c08ae211d2ac549d26
2020-06-23 16:46:13 +03:00
Tor Lillqvist
2bd05d68f7 tdf#133278: Don't overwrite the copy of the document that we are editing
When exporting a copy, let core write the copy to a temp subdirectory
before invoking UIDocumentPickerViewController to select where to
store it permanently.

Change-Id: I3d2292414a3c824515ba6d98ad09b296e543cea9
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95295
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-06-01 17:08:38 +02:00
Tor Lillqvist
48a5397ff4 Run the 'npm install' at configure time only on Linux
I don't want to make it necessary to have npm on macOS (in the case of
building the iOS app, otherwise Online is Linux-only). I still want to
use the method where the JS bits are built on a Linux machine and
loleaflet/dist is copied over to the Mac where you build the iOS app.

Remove the apparently never seriously used instructions for the other
way from ios/README. If somebody actually *uses* that way for real,
for a longer time, then please reinstate them, and modify
configure.ac, etc.

Change-Id: I22a8ca4746907bb11aad11d7c995b0de2fdbc157
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94815
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-05-26 09:02:14 +02:00
Tor Lillqvist
56afddaba0 Add RequestDetails.cpp and hpp
Change-Id: I084ce2e731073ab69a806d5053c27987b2a8244c
2020-05-15 23:34:01 +03:00
Tor Lillqvist
ee99423387 Add an "export options" plist for providing .ipa archives
Change-Id: If8309bf2548290ef9e4edd15eea2287253ffde17
2020-05-15 14:00:56 +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
fe9edb5e8b Bin leftover unused variable
Change-Id: I21eaec0f070698db119d396f4b24c6d3b785c1f3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93107
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-04-28 22:13:16 +02:00
Tor Lillqvist
edf217e1e4 Re-order to be in same order (alphabetical) as Xcode writes
Change-Id: I2e0999a11206f2f212534941a81abaab6dcc87df
2020-04-27 13:13:01 +03:00
Tor Lillqvist
b068e556de Make the Info.plist.in more like what Xcode writes
If you edit the Info.plist in Xcode, it is written with TABs and
eight-column indentation steps. Make the Info.plist.in the same to
make it easier to compare what changes in case you do some intentional
change in Xcode first.

This commit has only whitespace changes.

Change-Id: I0878eac5e19f666426ab67dd8e3c425027036756
2020-04-27 13:12:55 +03:00
Andras Timar
33000dfded typo fixes in comments and code
Change-Id: I6f31e050aab701e31064e1abc9429dce0a50c279
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92953
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-26 23:19:52 +02:00
Muhammet Kara
f507302993 Welcome: Add config for enabling the dismiss button
Change-Id: Ia2fbf066493d91a2b10866e66d11332b5cfc10fa
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92593
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2020-04-20 20:35:08 +02:00
Tor Lillqvist
4bc181e6c6 Use '#define FOO 0' instead of '#undef FOO' for stuff that is checked with #if
Change-Id: I8141022fc5cb622eeb63e5b28a99f0cd0a7affc4
2020-04-17 17:21:13 +03:00
Tor Lillqvist
53ef0936c1 Add ENABLE_WELCOME_MESSAGE
Change-Id: I54900694bd729419bd9c81ae2e7866b6597c3109
2020-04-17 17:21:13 +03:00
Tor Lillqvist
909734e261 Implement the "download as" functionality properly in the iOS app
We need to catch the downloadas message already in
-[DocumentViewController
userContentController:didReceiveScriptMessage:] and use an
UIDocumentPickerViewController to let the user choose where to
download (or export) the document. The iOS-specific code in
ChildSession::downloadAs() can go away.

Change-Id: I626b9986ec6156f7e83bda02b04e65f7819f8017
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92112
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-04-13 15:35:13 +02:00
Tor Lillqvist
34c27a6b9b Bump the internal iOS app version number to 4.2.4
Change-Id: I087b2ab81f4b3c8b3b85e9419743e5ce72dd398c
2020-04-13 11:00:46 +03:00
Tor Lillqvist
0930286e2d Fix problems after my 293f4913d2
It is enough to call the -[UIDocument
saveToURL:forSaveOperation:completionHandler:] only in
DocumentBroker::sendUnoSave(). And on the other hand, in
-[DocumentViewController bye] we can't want for the
LOOLWSD::lokit_main_mutex as the main queue is needed for parts of
what the saveToURL does.

Also, use a separate copy of the document as the file that is actually
edited by LO core. This matches what the Android app does. I think it
is useful to do this in order to avoid some hangs that I noticed. They
probably were caused by both LO core and the system frameworks
occasionally accessing the same document file at the same time.

Change-Id: Idb65be23a7cb6ad1288fbbd23c7471e0fb8d52f4
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91851
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-04-08 00:01:30 +02:00
Jan Holesovsky
61ad718671 Revert "Force portrait for the moment also for iPhone in the iOS app"
Landscape is supposedly working fine now.

This reverts commit d474f06040.

Change-Id: I28e6d521ee0c4906e07b99b8cc6c24761b20f2b3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91849
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-07 21:04:08 +02: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
Tor Lillqvist
312caf918b Add comment
Change-Id: I452b1d6fc150d014a5d55df71e9dae96288e67de
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91740
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-04-06 12:49:18 +02:00
Tor Lillqvist
05a29a19d5 Fix typo in comment and elaborate
Change-Id: I2e5560a27d8471188ebb159efd29192a10295547
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91739
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-04-06 12:48:01 +02:00
Tor Lillqvist
95de5a74cc Rename our Objective-C Document class to CODocument
There are already several classes called Document on the C++ side.
Let's reduce confusion a bit. (Also, we might need to use the
Objective-C Document class from some of the Online C++ code (which is
actually compiled as Objective-C++).)

Change-Id: I34347ba0161c067b14bb125c3410eefd89bbca31
2020-04-04 00:07:35 +03: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
4dd95f833d Propagate core and online git hashes to the Settings for the iOS app
The git hashes now show up in the Settings app, without having to run
the Collabora Office app, open a document, and check the About dialog.

The core git hash is taken from the core build directory's
instdir/program/setuprc.

Also, drop the fairly pointless lone Finnish localisation of the
Settings strings.

Change-Id: I56631f8facde017ed99038209c55f516386eab99
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91073
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-03-26 00:26:58 +01:00
Miklos Vajna
6890d2fdaa ios: fix opening hyperlinks
This was added in commit 2174206de1 (android:
Don't hang after returning from a hyperlink., 2020-02-14), but the new command
was only handled on Android. Handle HYPERLINK on iOS, too.

Change-Id: I8c942c1a64c8a52462a749989e312d0d9899a841
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90917
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-03-23 17:33:45 +01:00
Tor Lillqvist
16fbe5441d Bump the internal iOS app version number to 4.2.3
Change-Id: I083ed1dd96aba75da1fc6d6d47c8cbd7b1d62a24
2020-03-23 12:55:14 +02:00
Tor Lillqvist
d474f06040 Force portrait for the moment also for iPhone in the iOS app
Change-Id: I1def28e7969cea753e7fc36094fe6514c17d61af
2020-03-20 16:03:19 +02:00
Andras Timar
a66083de9b Try to delete language information from templates...
... in order to have languages agnostic templates.
fo:language="en" fo:language="US" was removed from styles.xml

Change-Id: I680809d33cb902fc447ea5393d7f8dad3d83cbfc
2020-03-14 22:29:17 +01:00
Tor Lillqvist
2004a0198d Bump the internal iOS app version number to 4.2.2
Otherwise, when one validates (or uploads) a new build, even just for
TestFlight purposes, one gets an error in Xcode: "The value for key
CFBundleShortVersionString [4.2.1] in the Info.plist file must contain
a higher version than that of the previously approved version
[4.2.1]."

(cherry picked from commit 585cf6be86c6535a9cf6b2ab45e9e606788433d2)

Change-Id: I2ea1342980384a8eb81312734747be5e686da347
2020-03-11 14:08:36 +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
Andras Timar
fdc05239af Remove hardcoded tab name Sheet1 from iOS spreadsheet template
Change-Id: I0916e968b33395cf682bf4ddc313c959526e7adf
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89171
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-02-21 11:34:21 +01:00
Tor Lillqvist
624b42d58a Hackaround for on-screen keyboard problem
We want to be able to force the on-screen keyboard to be displayed
(when there is no external hardware keyboard) from our JavaScript.

Change-Id: I0678d84ca941a03316ffb68cfd9c3e93a6ea7e57
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89023
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-02-19 15:17:56 +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
58205c9818 Bump version to 4.2.1
As a build of 4.2 has been approved for release in the App Store, we must bump
this before any new build can be uploaded, even just for TestFlight.

Change-Id: I60de542eaf6d10776ad287c8c9c5d36e0feed70c
2020-02-13 16:14:59 +02:00
Tor Lillqvist
0e797eeb3f Add some more core source files for breakpointing convenience
Change-Id: I829534011e037aac1297a41cdb0e6bf008e1b28b
2020-02-07 09:57:53 +02:00
Jan Holesovsky
ad32888d7c mobile: Unify the mutex usage that protects the main lokit thread.
Effectively both approaches were doing the same thing, let's unify to
the iOS way to minimize the platform-specific code.

Change-Id: I11290410a536c26db054ffcb87e3b64cc2a11c07
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/84589
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-02-06 09:44:26 +01:00
Tor Lillqvist
56d310636d tdf#129380: Don't show the "shortcut bar" if a hardware keyboard is used
Change-Id: If1138185e52b7240ff6190ddf3f7af01d2a47115
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87769
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2020-01-31 15:52:27 +01: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
Tor Lillqvist
948069632d Add source files from svx/source/tbxctrls and svtools/source/config
... to iOS project, for breakpointing convenience.

Change-Id: I3652afe8b833dbe3ec5aff006ef58424626a15a8
2019-12-21 03:37:41 +02:00
Tor Lillqvist
26860d8f35 Add public.content to the UTTypeConformsTo arrays of the exported UTIs
The Nextcloud app looks for that.

Change-Id: I91d26f7dced0b0ca35275db7ebabf322e50e734d
(cherry picked from commit 481f498dfb31ad364c4dfae179c1a2baef8118ab)
2019-11-21 10:24:17 +02:00
Tor Lillqvist
6aca28d0f1 Add some more source files to the Xcode project for debugging convenience
(It is, sadly, apparently possible to set breakpoints in advance
(before the code has reached that file) only in files that are listed
in the project.)

Also drop the nonexistent "filter" directory in Resources. (It is
config/filter.)

Change-Id: I96ec9dd8dc4591db9d640b01fb07e807565670cb
2019-11-07 08:45:05 +02:00
Tor Lillqvist
9d6c174462 tdf#128577: Close an already open document when asked to open a new one
Add a "singleton" class method to DocumentViewController to return the
(as for now) singleton DocumentViewController.

Change-Id: I0b8a8def558cfe7f9469b6062a86311dfa63f549
Reviewed-on: https://gerrit.libreoffice.org/82007
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
(cherry picked from commit 2807f907d947549a17c5bae586b85d412d552a09)
Reviewed-on: https://gerrit.libreoffice.org/82021
2019-11-04 15:25:54 +01:00
Tor Lillqvist
ed4558001f Set CFBundleShortVersionString to 4.2
Change-Id: I9115a9dc571c1b27e6b80181ec38732cb91ec799
Reviewed-on: https://gerrit.libreoffice.org/82019
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2019-11-04 15:24:41 +01:00
Tor Lillqvist
0c9bc2159b Add LSSupportsOpeningDocumentsInPlace
Probably a good idea, although doesn't seem to have much effect? At
least not on tdf#128577.

Change-Id: I7b66a2e9ba44bd4cef583c0861883edfae11eb1d
Reviewed-on: https://gerrit.libreoffice.org/82006
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
(cherry picked from commit 2990203dff05f977dfdc77b493deca051b54ca79)
Reviewed-on: https://gerrit.libreoffice.org/82020
2019-11-04 15:24:22 +01:00
Tor Lillqvist
1fac53764e Bump iOS Deployment Target to 12.2
Change-Id: Ie4df6293f80bc7568ac76244e9eb4e05cc712d76
(cherry picked from commit 9953f25f55544b0e2b878fb86f40521f7f54d49b)
2019-11-01 13:00:13 +02:00
Andras Timar
2efdb2016a Remove Lotus WordPro support
... because lotuswordpro filter is not present in MPLv2-only core builds

Change-Id: I100e886273f8b7fd38887576c2d29fad4c69b2e7
Reviewed-on: https://gerrit.libreoffice.org/79683
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
(cherry picked from commit d7813989913e95cefc8484d6d2af965ed5752588)
2019-10-25 14:39:29 +03:00
Tor Lillqvist
fdb91bf15e tdf#123733: Keep the WebKit view until the lokit_main thread has finished
Otherwise, if you close a document before it has been rendered
completely, the plumbing of threads and FakeSocket connections gets
confused and opening the next document hangs or runs into an assertion
failure. This typically happened for large presentations where
rendering the slide previews takes significant time.

Change-Id: I0f586bec021c4c045a129b3f179ddb3942915c58
Reviewed-on: https://gerrit.libreoffice.org/80882
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2019-10-16 13:20:38 +02:00
Tor Lillqvist
07986199ad Just call lok_init_2() and LibreOfficeKit::setLanguageTag() once on iOS
... when the app starts.

Change-Id: Icac4a9e1074fb6c5f3c9b5282e20a4513717a323
Reviewed-on: https://gerrit.libreoffice.org/80881
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2019-10-16 13:16:42 +02:00
Tor Lillqvist
1cf3bec303 tdf#123741: Call LibreOfficeKit::setLanguageTag() also when loading a template
Sadly I have no understanding why not doing that caused such a
mysterious end result. But I am glad I thought of trying this simple
thing before spending any more time trying to understand what is going
on.

Change-Id: I129f8fffa32fa087e21c444f9657394de0e255a1
2019-10-10 19:35:30 +03:00
Tor Lillqvist
39ddc5242d tdf#126974: When we are about to be killed, just exit bluntly
Letting the system call exit() will cause destructors of global C++
objects to be called, and doing that at an arbitrary point in time
will cause a crash. So just call std::_Exit() in the AppDelegate's
applicationWillTerminate: method.

Change-Id: I15d7a761db931a6b7aed588bb407fa0d3b4a9465
(cherry picked from commit 4c2cb838ff5fa2485ec74db11e239883a53f7ff9)
2019-10-09 14:30:20 +03:00
Tor Lillqvist
0e49800418 tdf#127942: Avoid the WKWebView popup with "Share...", "Add to Photos" etc
Seems that setting allowsLinkPreview to NO for the WKWebView affects
this functionality, too. Was just an educated guess, and it worked!
Single-line fixes to what initially seems like a hard problem are the
best.

Change-Id: Ic88bf53b883d857338c0316188e079e6797a4d76
Reviewed-on: https://gerrit.libreoffice.org/80208
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
(cherry picked from commit c7e38e6348a98c0a6fcaf20876c57cb01d56f4cc)
2019-10-05 11:41:18 +03:00
Tor Lillqvist
a04ddab0bf Set the Presentation of the Document View Controller to fullScreen
Otherwise, on iPadOS 13.1, the document will show up in a view that
doesn't cover all the screen, which looks weird, and also makes our
JavaScript code not realize it is on a tablet, so it uses the
phone-style UI, with toolbar at the bottom, no permanently visible
menu bar etc.

This also contains some other changes made by Xcode to the storyboard
file. The only intentional change was changing the Presentation to
"Full Screen", which added a modalPresentationStyle attribute to the
viewController element of the Document View Controller scene.

Change-Id: If33b53981ce40948c54b9adfe791b88a24c4e97d
Reviewed-on: https://gerrit.libreoffice.org/79558
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
(cherry picked from commit 0ee9b408cd37c58a769cdd0775e1b1f072e0b6e0)
Reviewed-on: https://gerrit.libreoffice.org/79565
2019-09-25 18:00:30 +02:00
Tor Lillqvist
18ac97913a There should not be a "filter" directory directly at the top level
Change-Id: Icfc86d57924f655d5d3f3f1245aa011012d898f1
Reviewed-on: https://gerrit.libreoffice.org/78143
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
(cherry picked from commit 48ac27e694167fd24dbc50b686849c1067bd2107)
2019-09-23 11:48:01 +03:00
Tor Lillqvist
02746c398a Add Lotus WordPro Document, the .lwp extension
Note that this is just one step, work is needed elsewhere, too, for
the app to actually manage to open a .lwp document correctly. (Desktop
Collabora Office opens such documents without problems.) As we can't
save this format, set the CFBundleTypeRole to "Viewer".

Change-Id: I5f818bf915a1a9ee607a97424b2437655f8a9d79
(cherry picked from commit 38e6ace9a6d2dfe848a185c97d955a06493cd21d)
Reviewed-on: https://gerrit.libreoffice.org/79384
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-23 10:44:30 +02:00
Tor Lillqvist
cc87beb06b The UTExportedTypeDeclarations for fodt was missing its UTTypeDescription
Change-Id: I1b35b1c1663e59409662eda905c351c7c54ee18a
(cherry picked from commit 0a134d888be57dc32af86aeb1f7a84629484f2b3)
Reviewed-on: https://gerrit.libreoffice.org/79383
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-23 10:44:10 +02:00
Tor Lillqvist
f9ed656c19 Fix some indentation glitches and add some comments
Change-Id: I352be04f9ca464f6306269da7263ba7f0a9c490e
(cherry picked from commit 8343d6ac02f13ca4c1532bf4817df03ed2e19e5c)
Reviewed-on: https://gerrit.libreoffice.org/79382
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-23 10:43:53 +02:00
Tor Lillqvist
94799fbce3 Try to unify the list of localisations with what I use to build LO core
(In the tree where I building the core branch used for the app as
distributed, that is.)

Change-Id: Ice622c79ff9c7f56f4e58f68fe65e5d89696681b
(cherry picked from commit 21dc19f7a28174fbd5eabd0f60b6f1cedcafd89c)
Reviewed-on: https://gerrit.libreoffice.org/79381
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-23 10:43:01 +02:00
Tor Lillqvist
d1087aec26 Prevent the user from zooming the WebView
Does not fix tdf#125383, though. The WebView still can become zoomed
by manipulating a tunnelled dialog as described in the bug report's
comments.

Change-Id: I9af8d826c58e2065e54b42bc35f74436b0d34a90
2019-06-11 17:33:48 +03:00
Tor Lillqvist
f94a00ddc9 No need for the emptyTileCache-related setting string here either now
The disk tile cache is now gone also in the collabora-online-4 branch,
so no need to keep the string here in master just to be translated.

Change-Id: Ibd496bee738f64152a5ca7a9634e439289b0cd80
2019-06-10 13:14:12 +03:00
Tor Lillqvist
13e99e83c3 Improve wording for NSCameraUsageDescription
Change-Id: If8fb70b2c87e6abc00cc706cb81c561e28edc254
2019-06-03 17:19:57 +03:00
Tor Lillqvist
c2c7d098e5 Typo
Change-Id: Ic5b149f7d3f51c0095ffa975d477df0ed0f183d7
2019-06-03 17:19:52 +03:00
Tor Lillqvist
75347f27e7 Add NSPhotoLibraryUsageDescription, too
Change-Id: Ib46c36a18e84c2b88bed7aef3ec8235b32eb5332
2019-06-03 17:19:46 +03:00
Tor Lillqvist
dc1f9a9955 Use a more specific NSCameraUsageDescription
Change-Id: Idc780a3b5dacf0bed5b8c49f758f3fc5696d7338
2019-06-03 17:19:40 +03:00
Tomaž Vajngerl
508a659232 Update ios/README
- instructions how to build POCO
    - fixes the changes made since

Change-Id: I157d23ce914b8afb06ccf6e6c33f8aa12661d1bb
2019-06-03 15:04:53 +09:00
Tor Lillqvist
a9dabea550 Add Visio Document, extensions vdx, vsd, vsdm, and vsdx
Together with two one-line changes to core, Visio files now open
(read-only) in the app.

Change-Id: I7dde2f7a8d1960c8fb9154c23e489ccc00a17b2d
2019-05-31 12:52:44 +03:00
Tor Lillqvist
ae88fc1052 tdf#124930: Look for settings also in the managed configuration thing
Could not test whether it works, but it is not complicated, so
hopefully yes. Followed the examples from
https://developer.apple.com/videos/play/wwdc2013/301/ and
https://developer.apple.com/library/archive/samplecode/sc2279/Introduction/Intro.html .

The Mobile.plist file is a sample only.

Note that here in the master branch there is no on-disk tile cache, so
no setting for emptying that or not.

Change-Id: I0b8cf8d35930cdf60808d14361378f050cf41037
2019-05-30 11:45:02 +03:00
Tor Lillqvist
2474166351 Add core source files from vcl/ios
Change-Id: I1ca8d3fbf7a63b1965abd6799642854e03c4952d
2019-05-30 11:41:38 +03:00
Tor Lillqvist
199c6e2918 Revert "Get rid of use of GNU libtool" and its follow-up
The change causes problems for people on various sad distros. Oh well,
whatever.

This reverts commit bd00d9fd05.
This reverts commit 054a9cdb04.

Change-Id: Ie439e4c655d02b6f34bdd1a9c1c5b6db6048b653
2019-05-27 10:25:51 +03:00
Tor Lillqvist
bd00d9fd05 Get rid of use of GNU libtool
It is is complicated enough to build the iOS app. Requiring GNU
libtool brings with it the risk of polluting the command environment
as there already is a completely different command in macOS with the
same name, /usr/bin/libtool. And as GNU libtool was used only to build
the unit tests for the "normal" server-based Online that are built and
run only on Linux anyway, we don't really need any of the
"portability" that GNU libtool brings.

Without GNU libtool, we compile all the $(wsd_sources) (see
test/Makefile.am) that the unit-* tests use into a single object file,
WsdSources.o. (Because they need to be compiled as PIC we can't use
the already compiled object files for the Online server programs.)
This required some additional minor changes to a few source files.

Change-Id: I20a2c523170376fa4c1a0d9d8d6b693a9779376f
Reviewed-on: https://gerrit.libreoffice.org/72840
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2019-05-24 09:50:16 +02:00
Tor Lillqvist
058b68fc3e tdf#122281: Prevent the WebView from scrolling
It is presumably possible to do it in the JavaScript, too, and then
the same problem would go away for normal Online viewed in Mobile
Safari, too. But I couldn't figure out how. Googling turned up various
advice that suggested using '-webkit-overflow-scrolling: auto;' for
the body of the page but it didn't seem to help. (I tried adding that
to the style attribute of the body element in loleaflet.html.m4.)

Change-Id: Iac3487a73eca218130583dde9decdb89c316c1fc
2019-05-20 16:25:52 +03:00
Tor Lillqvist
a31c7c851c Add some more core source files from sfx2/source/view
Change-Id: I3e7183ecea24ee0282cbd6fa6ad7d457fa5a781c
2019-05-20 16:25:52 +03:00
Tor Lillqvist
8ffd192856 Add also DocumentBroker.hpp for breakpointing convenience
Change-Id: I16e81ea16ad332b72f5af0df91c0249b5a2984f1
2019-05-16 14:59:41 +03:00
Tor Lillqvist
d9e5a47058 Introduce new flag to speed up shutdown of the Online plumbing in the iOS app
Spent hours on trying to cleverly use the existing TerminationFlag
(with minor modifications to the code that checks it, and some
additional code to set and reset it), but could not get it to work.
This is simpler, but sure, using a global variable is ugly of course.
At least the new MobileTerminationFlag is very specific in semantics
and only used in the mobile apps.

Change-Id: I0775fdfa7880750ca12c6fd7ec41d3d3ceb2f0ad
2019-05-16 11:44:41 +03:00
Tor Lillqvist
32c1dd0a5d Add more core source files for breakpointing convenience 2019-05-16 11:39:32 +03:00
Tor Lillqvist
420bedaadc Edit ios/README
Point out that in my way, you will (sadly) need GNU libtool for the
running of the autogen.sh script, even if not actually at all
otherwise.

(We should really try to get rid of the need for libtool. A minor
amount of hacking to loleaflet/Makefile.am should be enough.)
2019-05-16 02:17:54 +03:00
Tor Lillqvist
f21665f2ac tdf#124981: Fix a few object leaks
The pointer to the DocumentViewController object in the Document class
can be a weak property. This avoids a circular reference.

When the DocumentViewController is being dismissed, remove the script
message handlers and remove the view from its superview. Also, set the
webView property to nil.
2019-04-26 18:04:10 +03:00
Tor Lillqvist
bf520d5fa5 Log the timestamp of the template file at its site and of its cached version 2019-04-26 12:04:28 +03:00
Tor Lillqvist
db9208d364 tdf#124918: Don't crash on invalid URLs in the template list file 2019-04-26 12:04:20 +03:00
Tor Lillqvist
d550944053 tdf#124918: More logging in template download error situations 2019-04-26 12:04:09 +03:00
Tor Lillqvist
4e2ad4d2bc tdf#124918: Allow empty lines in the template list file 2019-04-26 12:04:01 +03:00
Tor Lillqvist
05e4cf90f9 Remove leftovers of loading.html from iOS app project, too
Change-Id: Iecbbbc8ea42c0e26e6dde3f38a57482ad60135d5
2019-04-25 17:25:15 +03:00
Tor Lillqvist
824834dfa8 Turn on Unipoll for the iOS app, too
Change-Id: Ib0b7ac53b7c936e75446004c4581ace415b1dd5c
2019-04-24 13:24:53 +03:00
Tor Lillqvist
60581962af Add branding to the iOS app
A configure argument, --with-iosapp-branding, should point to a
directory containing a branding.css file and possibly other files that
branding.css references, to be bundled and used by the iOS app. The
directory structure ends upp in the app bundle as Branding. The
generated loleaflet.html for the iOS app references
Branding/branding.css unconditionally.
2019-04-22 17:23:20 +03:00
Tor Lillqvist
4cfd2e8744 Bin three unnecessary translatable strings that don't occur anywhere
They for some reason appear when one adds a Settings Bundle to the
project using Xcode, but are not needed, as far as I see

(I already removed a fourth when I added the Finnish localisation.)
2019-04-12 23:06:29 +03:00
Tor Lillqvist
bf676c8643 Add a string for translation from the collabora-online-4 branch
... even if it doesn't occur here in master, as the on-disk tile cache is gone.

Change-Id: I1ab5d5edde0386ca4c6c452b1cf4292c30a7e3df
2019-04-12 22:46:33 +03:00
Tor Lillqvist
095c4de38b Experiment with adding localisation of the Settings.bundle
Add a sample Finnish localisation. The localised Root.strings files
are supposed to come from some Pootle-based workflow eventually.

Apparently there is some new and improved way to do localisation in
Xcode 10, "Base localisation", but our project file was created in an
earlier Xcode version and I couldn't figure out how to do it the new
way for Settings.bundle, so I manually added the fi.lproj directory.

I changed the English Root.strings file to be in UTF-8 instead of
UTF-16 (and it still works). (The Finnish one is UTF-8, too.) I added
the strings to be translated from Root.plist into it. That is the file
that should be used as a base for Pootle work, no need to extract
strings from the Root.plist, I think.

Change-Id: I80f1c3199ee14678bb1438e218eb9c2475cd66f8
2019-04-12 21:26:37 +03:00
Jan Holesovsky
ea659b3d99 Use the app name more generally, not only on iOS.
Preparation for using it on Android too.

Change-Id: Iee7778b2625a02a98daff5df87c39f4ab1d18144
Reviewed-on: https://gerrit.libreoffice.org/70651
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2019-04-12 13:44:40 +02:00