diff options
author | Andrzej Hunt <andrzej@ahunt.org> | 2014-09-25 09:20:56 +0100 |
---|---|---|
committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-12-04 12:23:03 +0100 |
commit | 885a578b2c48667cff6958ea5ec2705d48954a2e (patch) | |
tree | 11d6b2e9846259d417bc3570f752336ba47e7949 /android/Bootstrap | |
parent | eefdd2ee550605f8f78ece452ad5bdabf0a1de9d (diff) |
LOK Android: don't initialise until TMPDIR is set.
As part of LOK initialisation we now start soffice_main, this
requires TMPDIR access, and will fail if we haven't set TMPDIR
(as by default it attemps to access /tmp which is not allowed on
Android).
Change-Id: I63bd7bce9b52c898c60fda6eea33ee919349a109
Diffstat (limited to 'android/Bootstrap')
-rw-r--r-- | android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java index e52003946c18..afd81b33eff3 100644 --- a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java +++ b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java @@ -67,10 +67,6 @@ public final class LibreOfficeKit String cacheDir = activity.getApplication().getCacheDir().getAbsolutePath(); String apkFile = activity.getApplication().getPackageResourcePath(); - if (!initializeNative(dataDir, cacheDir, apkFile)) { - return; - } - // If we notice that a fonts.conf file was extracted, automatically // set the FONTCONFIG_FILE env var. InputStream inputStream = null; @@ -88,6 +84,10 @@ public final class LibreOfficeKit // TMPDIR is used by osl_getTempDirURL() putenv("TMPDIR=" + activity.getCacheDir().getAbsolutePath()); + if (!initializeNative(dataDir, cacheDir, apkFile)) { + return; + } + initializeDone = true; } |