summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-03-23 15:21:09 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-03-23 15:50:17 +0100
commitf6a74ce9bbe4788fbeff463b52557b7e5aaa809f (patch)
tree5ee1e2eb218f3685fcd19fd8a20ce2e4a7444c5d /android
parent9f6d7d40b00fd67200c1a2a863cded790e77a40a (diff)
no need for IPC on Android, removes the need for the cache-hack
removing the cache on each launch prevented opening files via intents (i.e. from your mail application) unless the viewer was already running, as it also deleted the temporary file that was created from the intent. Change-Id: I0a4d9432f475e8434902ae11fc2b0c35fd25a71f
Diffstat (limited to 'android')
-rw-r--r--android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java17
1 files changed, 1 insertions, 16 deletions
diff --git a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
index b2fb5e12053a..1590fd99b100 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
@@ -64,8 +64,7 @@ public final class LibreOfficeKit
Log.i(LOGTAG, String.format("Initializing LibreOfficeKit, dataDir=%s\n", dataDir));
redirectStdio(true);
- // ToDo: ugly workaround - find out why it segfaults with existing cachedir
- deleteRecursive(activity.getApplication().getCacheDir());
+
String cacheDir = activity.getApplication().getCacheDir().getAbsolutePath();
String apkFile = activity.getApplication().getPackageResourcePath();
@@ -93,20 +92,6 @@ public final class LibreOfficeKit
}
initializeDone = true;
}
- /**
- * Deletes files and recursively deletes directories.
- *
- * @param file
- * File or directory to be deleted.
- */
- private static void deleteRecursive(File file) {
- Log.d(LOGTAG, "deleting cacheDir recursively - this is only a workaround - fixme please");
- if (file.isDirectory()) {
- for (File child : file.listFiles())
- deleteRecursive(child);
- }
- file.delete();
- }
// Now with static loading we always have all native code in one native
// library which we always call liblo-native-code.so, regardless of the