strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
libreoffice-online/ios/Mobile/CODocument.h

30 lines
736 B
C
Raw Normal View History

Intermediate commit of work in progress on an iOS app The app is unimaginatively called "Mobile" for now. Runs but crashes pretty quickly after loading the document by the LO core. Will need some heavy changes to get a ClientSession object created in there, too, to handle the (emulated) WebSocket messages from the JavaScript. It would then handle some of these messages itself, and forwards some to the ChildSession, which in this case is in the same process. Now the messsages from the JavaScript go to a ChildSession, which is wrong. As the assertion says, "Tile traffic should go through the DocumentBroker-LoKit WS"
2018-09-11 01:30:55 -05:00
// -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*-
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
Still more iOS app and related Online C++ code hacking Re-think the plumbing between the different parts of the C++ Online code. Do try to have it work more like in real Online on all but the lowest socket level. Except that we don't have multiple processes, but threads inside the same process. And instead of using actual system sockets for WebSocket traffic between the threads, we use our own FakeSocket things, with no WebSocket framing of messages. Reduce the amount of #ifdef MOBILEAPP a bit also by compiling in the UnitFoo things. Hardcode that so that no unit testing is ever attempted, though. We don't try to dlopen any library. Corresponding changes in the app Objective-C code. Plus fixes and functionality improvements. Now it gets so far that the JavaScript code thinks it has the document tiles presented, and doesn't crash. But it hangs occasionally. And all tiles show up blank. Anyway, progress. Change-Id: I769497c9a46ddb74984bc7af36d132b7b43895d4
2018-09-13 11:16:00 -05:00
#import <string>
Intermediate commit of work in progress on an iOS app The app is unimaginatively called "Mobile" for now. Runs but crashes pretty quickly after loading the document by the LO core. Will need some heavy changes to get a ClientSession object created in there, too, to handle the (emulated) WebSocket messages from the JavaScript. It would then handle some of these messages itself, and forwards some to the ChildSession, which in this case is in the same process. Now the messsages from the JavaScript go to a ChildSession, which is wrong. As the assertion says, "Tile traffic should go through the DocumentBroker-LoKit WS"
2018-09-11 01:30:55 -05:00
#import <UIKit/UIKit.h>
#define LOK_USE_UNSTABLE_API
#import <LibreOfficeKit/LibreOfficeKit.h>
@class DocumentViewController;
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-03 16:04:20 -05:00
@interface CODocument : UIDocument {
Intermediate commit of work in progress on an iOS app The app is unimaginatively called "Mobile" for now. Runs but crashes pretty quickly after loading the document by the LO core. Will need some heavy changes to get a ClientSession object created in there, too, to handle the (emulated) WebSocket messages from the JavaScript. It would then handle some of these messages itself, and forwards some to the ChildSession, which in this case is in the same process. Now the messsages from the JavaScript go to a ChildSession, which is wrong. As the assertion says, "Tile traffic should go through the DocumentBroker-LoKit WS"
2018-09-11 01:30:55 -05:00
@public
Still more iOS app and related Online C++ code hacking Re-think the plumbing between the different parts of the C++ Online code. Do try to have it work more like in real Online on all but the lowest socket level. Except that we don't have multiple processes, but threads inside the same process. And instead of using actual system sockets for WebSocket traffic between the threads, we use our own FakeSocket things, with no WebSocket framing of messages. Reduce the amount of #ifdef MOBILEAPP a bit also by compiling in the UnitFoo things. Hardcode that so that no unit testing is ever attempted, though. We don't try to dlopen any library. Corresponding changes in the app Objective-C code. Plus fixes and functionality improvements. Now it gets so far that the JavaScript code thinks it has the document tiles presented, and doesn't crash. But it hangs occasionally. And all tiles show up blank. Anyway, progress. Change-Id: I769497c9a46ddb74984bc7af36d132b7b43895d4
2018-09-13 11:16:00 -05:00
int fakeClientFd;
Fix problems after my 293f4913d2cdfe5385e2cdc0e3bebde281da1578 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-07 13:21:55 -05:00
NSURL *copyFileURL;
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-04-24 02:46:54 -05:00
unsigned appDocId;
Intermediate commit of work in progress on an iOS app The app is unimaginatively called "Mobile" for now. Runs but crashes pretty quickly after loading the document by the LO core. Will need some heavy changes to get a ClientSession object created in there, too, to handle the (emulated) WebSocket messages from the JavaScript. It would then handle some of these messages itself, and forwards some to the ChildSession, which in this case is in the same process. Now the messsages from the JavaScript go to a ChildSession, which is wrong. As the assertion says, "Tile traffic should go through the DocumentBroker-LoKit WS"
2018-09-11 01:30:55 -05:00
}
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 09:52:33 -05:00
@property (weak) DocumentViewController *viewController;
Intermediate commit of work in progress on an iOS app The app is unimaginatively called "Mobile" for now. Runs but crashes pretty quickly after loading the document by the LO core. Will need some heavy changes to get a ClientSession object created in there, too, to handle the (emulated) WebSocket messages from the JavaScript. It would then handle some of these messages itself, and forwards some to the ChildSession, which in this case is in the same process. Now the messsages from the JavaScript go to a ChildSession, which is wrong. As the assertion says, "Tile traffic should go through the DocumentBroker-LoKit WS"
2018-09-11 01:30:55 -05:00
- (void)send2JS:(const char*)buffer length:(int)length;
@end
// vim:set shiftwidth=4 softtabstop=4 expandtab:
Reference in a new issue Copy permalink