From 34d012a128dfa959aa345672ebf4f9de80253b63 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Fri, 12 Apr 2019 17:50:52 +0200 Subject: android: Make the tiled rendering from the loolwsd actually work. Not to break the 'old' Android app, introduce a bool that can indicate if we are using the LOK from the 'old' (LOK-via-JNI-based) or from the 'new' (loolwsd-based) app. Change-Id: I38bd665cc1d5bc88018574171443ecabc46763df Reviewed-on: https://gerrit.libreoffice.org/70678 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky --- sal/android/libreofficekit-jni.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'sal') diff --git a/sal/android/libreofficekit-jni.c b/sal/android/libreofficekit-jni.c index edd56a2fec37..0f66fdc44fe0 100644 --- a/sal/android/libreofficekit-jni.c +++ b/sal/android/libreofficekit-jni.c @@ -37,6 +37,7 @@ extern const char* data_dir; extern const char* cache_dir; extern void* apk_file; extern int apk_file_size; +extern bool android_lok_from_jni; ///< for the distinction if the LOK is used for the 'old' (JNI-based) or the 'new' (loolwsd-based) app AAssetManager* native_asset_manager; extern void Java_org_libreoffice_android_Bootstrap_putenv(JNIEnv* env, jobject clazz, jstring string); @@ -157,6 +158,11 @@ jboolean Java_org_libreoffice_kit_LibreOfficeKit_initializeNative size_t data_dir_len; (void) clazz; + + // the 'old' app needs to avoid setting the virtual device to transparent + // in paintTile(), so indicate we are using the 'old' app + android_lok_from_jni = true; + libreofficekit_initialize(env, dataDir, cacheDir, apkFile, assetManager); // LibreOfficeKit expects a path to the program/ directory -- cgit v1.2.3