diff options
author | Andrzej Hunt <andrzej@ahunt.org> | 2014-09-25 09:20:56 +0100 |
---|---|---|
committer | Andrzej Hunt <andrzej@ahunt.org> | 2014-09-25 09:20:56 +0100 |
commit | 59c84d1793b71b1b8affb53cbf20ac19c4d66058 (patch) | |
tree | 7af468445d6c7432bb3b76f94d38c79035c856cb | |
parent | fa1b21a3126f9151e6e2cef8c4dbedc1adb1f312 (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
-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 c76c0fd7cbaa..096076d7f1da 100644 --- a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java +++ b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java @@ -66,10 +66,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; @@ -87,6 +83,10 @@ public final class LibreOfficeKit // TMPDIR is used by osl_getTempDirURL() putenv("TMPDIR=" + activity.getCacheDir().getAbsolutePath()); + if (!initializeNative(dataDir, cacheDir, apkFile)) { + return; + } + initializeDone = true; } |