From 1060cd84591faa2093cfdadf87d7bdfcc11b8dfb Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 13 Aug 2012 07:40:27 +0300 Subject: [PATCH] Perform setup(Activity) just once Change-Id: Icf77936c4307f816e85cb840d650a4c958a15995 --- .../Bootstrap/src/org/libreoffice/android/Bootstrap.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java index 15b0f35f3416..b2fc540d0636 100644 --- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java +++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java @@ -124,10 +124,17 @@ public class Bootstrap extends NativeActivity public static native void delete_byte_buffer_wrapper(long bbw); + static boolean setup_done = false; + // This setup() method is called 1) in apps that use *this* class as their activity from onCreate(), // and 2) should be called from other kinds of LO code using apps. - public static void setup(Activity activity) + public static synchronized void setup(Activity activity) { + if (setup_done) + return; + + setup_done = true; + String dataDir = null; ApplicationInfo ai = activity.getApplicationInfo();