android: Make the extract_files() part of setup / init.

We need to have the files extracted before we attempt to initialize
LibreOfficeKit (call libreofficekit_hook), otherwise the .rdb's are not there.

Change-Id: Ib49db7e945a709d18a063eb488a27df18fef542b

2 files changed, 2 insertions, 14 deletions

diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index 13d1a23fdfa9..89766e62cf89 100644
--- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
+++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
@@ -37,9 +37,6 @@ public final class Bootstrap
                                         String cacheDir,
                                         String apkFile);
 
-    // Extracts files in the .apk that need to be extraced into the app's tree
-    static native void extract_files();
-
     // Wrapper for getpid()
     public static native int getpid();
 
@@ -101,9 +98,6 @@ public final class Bootstrap
                    activity.getApplication().getPackageResourcePath()))
             return;
 
-        // Extract files from the .apk that can't be used mmapped directly from it
-        extract_files();
-
         // If we notice that a fonts.conf file was extracted, automatically
         // set the FONTCONFIG_FILE env var.
         InputStream i;
diff --git a/android/Bootstrap/src/org/libreoffice/android/LibreOfficeKit.java b/android/Bootstrap/src/org/libreoffice/android/LibreOfficeKit.java
index e7507d5a1dcf..58d6c500a17f 100644
--- a/android/Bootstrap/src/org/libreoffice/android/LibreOfficeKit.java
+++ b/android/Bootstrap/src/org/libreoffice/android/LibreOfficeKit.java
@@ -26,7 +26,7 @@ public final class LibreOfficeKit
     {
     }
 
-    private static String TAG = "lo-bootstrap";
+    private static String TAG = "LibreOfficeKit";
 
     // Native methods in this class are all implemented in
     // sal/android/lo-bootstrap.c as the lo-bootstrap library is loaded with
@@ -37,9 +37,6 @@ public final class LibreOfficeKit
                                        String cacheDir,
                                        String apkFile);
 
-    // Extracts files in the .apk that need to be extraced into the app's tree
-    static native void extract_files();
-
 /*
     // Wrapper for getpid()
     public static native int getpid();
@@ -92,7 +89,7 @@ public final class LibreOfficeKit
 
         ApplicationInfo ai = activity.getApplicationInfo();
         dataDir = ai.dataDir;
-        Log.i(TAG, String.format("dataDir=%s\n", dataDir));
+        Log.i(TAG, String.format("Initializing LibreOfficeKit, dataDir=%s\n", dataDir));
 
         redirect_stdio(true);
 
@@ -101,9 +98,6 @@ public final class LibreOfficeKit
                   activity.getApplication().getPackageResourcePath()))
             return;
 
-        // Extract files from the .apk that can't be used mmapped directly from it
-        extract_files();
-
         // If we notice that a fonts.conf file was extracted, automatically
         // set the FONTCONFIG_FILE env var.
         InputStream i;