Commit graph

33 commits

Author SHA1 Message Date
Jan Holesovsky
4f5e262344 Revert "android: Various fixes to make the sending from the core to JS..."
Lets leave this optimization for later, this is incomplete, and does not
fix the problem which it was originally supposed to address.

This reverts commit bce922e8fd.

Change-Id: I5d2ee19058261c7612d36014181f509604c8acde
2019-02-20 00:38:16 +01:00
Jan Holesovsky
bce922e8fd android: Various fixes to make the sending from the core to JS working.
Change-Id: Idc22ccbae1effac9e2db5293703a768e033fd7e9
2019-02-19 10:56:58 +01:00
Jan Holesovsky
a3226c108c android: Don't split the base64 encoded string to separate lines.
Change-Id: Ie307f123bd2eec708adff581481d12babd1867ec
2019-02-19 10:56:58 +01:00
Jan Holesovsky
a9fc9ee63a android: Cannot read the assets directly, use the unpack instead.
Change-Id: I89818b122757b0f77a71c68e67cb2a1a27f2c0fb
2019-02-19 10:56:58 +01:00
Jan Holesovsky
91280ea905 android: Need the the JavaVM in LibreOfficeKit too.
Change-Id: Ice4a25be0e6eb8a2aa8e571bd22847e5fda1e8a2
2019-02-19 10:56:58 +01:00
Jan Holesovsky
8cd64c8cd8 android: Make sending to JavaScript work.
I haven't tested yet if the message actually gets to the JS, but
definitely the callFakeWebsocketOnMessage() is called and the WebView
does not complain that it is called from another thread.

Change-Id: I0e32d5a7d8937d754ac9dc6aa4ef763b56b44a52
2019-02-16 01:51:54 +01:00
Jan Holesovsky
40ffc4306a android: Passing messages from the native code to JS (incomplete).
Later we can come up with a way how to call it directly, but for the
moment, the indirection through Java is the easiest to implement.

Incomplete, needs a bit of more work to work from the thread.

Change-Id: I85ec997e32b5bd7d809142307e6fbaf42fc6ec2d
2019-02-15 18:45:18 +01:00
Gülşah Köse
5a3a90c5ec Remove unnecessary button from ui and make webview fullscreen.
Change-Id: Ia07dc38b9394b0ae174ec112d828b858990488c3
Signed-off-by: Gülşah Köse <gulsah.kose@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/67815
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2019-02-15 17:48:14 +01:00
Gülşah Köse
62e2d47921 Associate files with the android application.
Change-Id: I9a654ea1cac8523b9422e5c183a5127244efb25f
Signed-off-by: Gülşah Köse <gulsah.kose@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/67817
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2019-02-15 17:47:06 +01:00
Jan Holesovsky
427c5ea219 android: Settings for the build.gradle.
Change-Id: I457a7fb8a80106c0474ee03229e712a557cf799b
2019-02-15 16:53:35 +01:00
Jan Holesovsky
a362bdec09 android: Some pieces have to be unpacked out of the APK.
Mostly copied from the core.git.

Change-Id: I87472037c48d69a904440fd8008b515d604bb84b
2019-02-15 16:53:35 +01:00
Jan Holesovsky
df3faf45ae android: Better path for the fonts.conf.
Change-Id: Iaecbec1b24dd4806da3f52e8eb3e1eddd64891b3
2019-02-15 16:53:35 +01:00
Jan Holesovsky
4480a32577 android: Actually use /assets as the dataDir.
Change-Id: I00a6263644effc6bf20a46c90d811e6fa0cf1e09
2019-02-15 16:53:35 +01:00
Jan Holesovsky
2d7bb54826 android: Add / generarate various bootstrap-related files into the APK.
Mostly taken from core.git.

Change-Id: Idb7c7078cb78b257b04737daa00cf210cbe2cf87
2019-02-15 16:53:35 +01:00
Jan Holesovsky
a25b256282 android: Package the lo-native-code.so and dependencies into the APK.
Additionally don't strip the debugging symbols when building a debug APK
for easier debugging in the Android Studio.

Change-Id: I522a91da511a2868a2a07d80b4a25fea0dbd2621
2019-02-15 16:53:35 +01:00
Jan Holesovsky
a98d08fbb3 android: Copy the liblo-native-code.so over from core.git.
Change-Id: I457a7fb8a80106c0474ee03229e712a557cf799b
2019-02-15 16:53:35 +01:00
Jan Holesovsky
835bb3db35 android: Perform the android-specific setup before initializing the LOK.
Change-Id: I935e6849dd41c5e66b768c7f2a79c139265c901f
2019-02-15 16:53:35 +01:00
Jan Holesovsky
95827f3c1c android: Actually attempt to load the file for real.
Hits an assert, no LOK is available.

Change-Id: I86b46ea2fcee41966f46ae7f54fe5a506aa7769a
2019-02-13 21:52:43 +01:00
Jan Holesovsky
7604f9b218 android: Pass the messages from JS to the MainActivity.
Change-Id: Id2d5bac0f67668305ed47276614fde590d461901
2019-02-13 21:18:57 +01:00
Jan Holesovsky
e3b17cdc3c android: Don't try to read discovery.xml, it's not needed on mobile.
With this, the actual loolwsd startup does not crash any more, so let's
enable it :-)  Of course it still does not work yet.

Change-Id: I5a1ee7adac64c57f1aa5b597c3dbdc0089a1ac11
2019-02-13 17:36:19 +01:00
Jan Holesovsky
7a0209c7aa android: Link against the debug POCO libraries if --enable-debug.
Change-Id: Ic7dc3076a12fe9a0faf4dec5c0f5b0b3a5a171c3
2019-02-13 17:28:01 +01:00
Jan Holesovsky
7f0f6e5a36 android: Restart if anything goes wrong.
But sleep for a bit of time between the runs to avoid a busy loop.

Change-Id: I90a7bee052d82e8a0488e6a34fb1b6f43e6f6e64
2019-02-13 16:37:54 +01:00
Jan Holesovsky
dc37e633ef android: JNI for the LOOLWSD initialization.
For the moment it crashes, so the actual call is commented out.

Change-Id: Ie4acb2a91f280dcc08951dcce417b8d4552cbfe7
2019-02-13 15:17:50 +01:00
Jan Holesovsky
e79f5f7ec6 android: Create the html, js and css and copy it to the right place.
Change-Id: I3efbba0ae369387796e2d08b3003e4f469610dda
2019-02-13 13:22:25 +01:00
Jan Holesovsky
6d8d40a267 android: Use configure for the rest of the hardcoded stuff in CMakeLists.txt.
Change-Id: I61ae98c87f439dffe6df4b9c61da7e7c5f968786
2019-02-13 12:09:36 +01:00
Jan Holesovsky
3af9580489 android: Generate the CMakeLists.txt from configure.
Change-Id: I9012e78adda55640c6fe74829fcb7f7a2fb25ce6
2019-02-13 11:32:49 +01:00
Gülşah Köse
8249dc78ae android: Call javascript code from java
Change-Id: I29f1d0f672d262218ca82d8c9e1c10696c5b26bf
2019-02-13 10:53:41 +01:00
Gülşah Köse
3a748a2142 android: Call java code from javascript
Change-Id: I5b2907d6a6941d8debaf3150789f272f72413536
2019-02-13 10:53:41 +01:00
Gülşah Köse
52f2e78b9d android: Embed a html file into webview
Change-Id: I73b3c7ad7a874cb90f33614d1d4bd0cb88b91117
2019-02-13 10:53:41 +01:00
Gülşah Köse
5f8819a749 android: Enable javascript
Change-Id: I841b0cfd50b2be6a946ba59571f4b15535354fcb
2019-02-13 10:53:41 +01:00
Gülşah Köse
02c679c9d6 android: Inital commit of the Java pieces.
Change-Id: I895d5aaaf7217b7fd556f7805c42d3ec1bdfc22d
2019-02-13 10:53:37 +01:00
Jan Holesovsky
4771ad0c4a android: The order of static libraries is important.
Otherwise some symbols are optimized out, but needed by a later library.
2019-02-12 13:24:04 +01:00
Jan Holesovsky
4f03f09c53 android: Gradle project and other stuff to build. 2019-02-12 10:50:40 +01:00