From b3c9951006f9bd863244f1db3d54ac7866d66f0a Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 4 Jun 2012 04:36:52 +0200 Subject: Fix Bug 583: Remove Android compile-time dependencies and exclude Android specific classes for non Android platforms. Android specifics are delegated via class AndroidUtils, which uses reflection to call AndroidUtilsImpl if platform is Android. Android code is confined to the packages: jogamp.common.os.android.* jogamp.android.launcher.* and only included when compiled for the Android platform. --- src/java/jogamp/common/os/AndroidUtils.java | 94 ++++++++++++++++++++++ .../jogamp/common/os/android/AndroidUtilsImpl.java | 91 +++++++++++++++++++++ .../jogamp/common/os/android/PackageInfoUtil.java | 63 --------------- .../jogamp/common/os/android/StaticContext.java | 12 +++ 4 files changed, 197 insertions(+), 63 deletions(-) create mode 100644 src/java/jogamp/common/os/AndroidUtils.java create mode 100644 src/java/jogamp/common/os/android/AndroidUtilsImpl.java delete mode 100644 src/java/jogamp/common/os/android/PackageInfoUtil.java (limited to 'src/java/jogamp') diff --git a/src/java/jogamp/common/os/AndroidUtils.java b/src/java/jogamp/common/os/AndroidUtils.java new file mode 100644 index 0000000..743a736 --- /dev/null +++ b/src/java/jogamp/common/os/AndroidUtils.java @@ -0,0 +1,94 @@ +/** + * Copyright 2012 JogAmp Community. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of JogAmp Community. + */ +package jogamp.common.os; + +import java.io.File; +import java.lang.reflect.Method; +import java.security.AccessControlContext; + +import com.jogamp.common.os.AndroidVersion; +import com.jogamp.common.util.ReflectionUtil; + +public class AndroidUtils { + + private static final Method androidGetPackageInfoVersionNameMethod; + private static final Method androidGetPackageInfoVersionCodeMethod; + private static final Method androidGetTempRootMethod; + + static { + if(AndroidVersion.isAvailable) { + final ClassLoader cl = AndroidUtils.class.getClassLoader(); + final Class androidAndroidUtilsImplClz = ReflectionUtil.getClass("jogamp.common.os.android.AndroidUtilsImpl", true, cl); + androidGetPackageInfoVersionCodeMethod = ReflectionUtil.getMethod(androidAndroidUtilsImplClz, "getPackageInfoVersionCode", String.class); + androidGetPackageInfoVersionNameMethod = ReflectionUtil.getMethod(androidAndroidUtilsImplClz, "getPackageInfoVersionName", String.class); + androidGetTempRootMethod = ReflectionUtil.getMethod(androidAndroidUtilsImplClz, "getTempRoot", AccessControlContext.class); + } else { + androidGetPackageInfoVersionCodeMethod = null; + androidGetPackageInfoVersionNameMethod = null; + androidGetTempRootMethod = null; + } + } + + /** + * @return null if platform is not Android or no Android Context is registered + * via {@link jogamp.common.os.android.StaticContext#init(android.content.Context) StaticContext.init(..)}, + * otherwise the found package version code of packageName is returned. + */ + public static final int getPackageInfoVersionCode(String packageName) { + if(null != androidGetPackageInfoVersionCodeMethod) { + return ((Integer) ReflectionUtil.callMethod(null, androidGetPackageInfoVersionCodeMethod, packageName)).intValue(); + } + return -1; + } + + /** + * @return null if platform is not Android or no Android Context is registered + * via {@link jogamp.common.os.android.StaticContext#init(android.content.Context) StaticContext.init(..)}, + * otherwise the found package version name of packageName is returned. + */ + public static final String getPackageInfoVersionName(String packageName) { + if(null != androidGetPackageInfoVersionNameMethod) { + return (String) ReflectionUtil.callMethod(null, androidGetPackageInfoVersionNameMethod, packageName); + } + return null; + } + + /** + * @return null if platform is not Android or no Android Context is registered + * via {@link jogamp.common.os.android.StaticContext#init(android.content.Context) StaticContext.init(..)}, + * otherwise the context relative world readable temp directory returned. + */ + public static File getTempRoot(AccessControlContext acc) + throws RuntimeException { + if(null != androidGetTempRootMethod) { + return (File) ReflectionUtil.callMethod(null, androidGetTempRootMethod, acc); + } + return null; + } + +} diff --git a/src/java/jogamp/common/os/android/AndroidUtilsImpl.java b/src/java/jogamp/common/os/android/AndroidUtilsImpl.java new file mode 100644 index 0000000..f6a1444 --- /dev/null +++ b/src/java/jogamp/common/os/android/AndroidUtilsImpl.java @@ -0,0 +1,91 @@ +/** + * Copyright 2011 JogAmp Community. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of JogAmp Community. + */ +package jogamp.common.os.android; + +import java.io.File; +import java.security.AccessControlContext; + +import android.content.Context; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.util.Log; + +public class AndroidUtilsImpl { + private static boolean DEBUG = false; + + public static final PackageInfo getPackageInfo(String packageName) { + return getPackageInfo(StaticContext.getContext(), packageName); + } + + public static final PackageInfo getPackageInfo(Context ctx, String packageName) { + if(null != ctx) { + try { + final PackageInfo pi = ctx.getPackageManager().getPackageInfo(packageName, PackageManager.GET_META_DATA); + if(DEBUG) Log.d(MD.TAG, "getPackageInfo("+packageName+"): "+pi); + return pi; + } catch (Exception e) { if(DEBUG) { Log.d(MD.TAG, "getPackageInfo("+packageName+")", e); } } + } + if(DEBUG) Log.d(MD.TAG, "getPackageInfo("+packageName+"): NULL"); + return null; + } + + public static final int getPackageInfoVersionCode(String packageName) { + final PackageInfo pInfo = getPackageInfo(packageName); + return ( null != pInfo ) ? pInfo.versionCode : -1 ; + } + + public static final String getPackageInfoVersionName(String packageName) { + final PackageInfo pInfo = getPackageInfo(packageName); + final String s = ( null != pInfo ) ? pInfo.versionName : null ; + if(DEBUG) Log.d(MD.TAG, "getPackageInfoVersionName("+packageName+"): "+s); + return s; + } + + /** + * @return null if no Android Context is registered + * via {@link jogamp.common.os.android.StaticContext#init(android.content.Context) StaticContext.init(..)}, + * otherwise the context relative world readable temp directory returned. + */ + public static File getTempRoot(AccessControlContext acc) + throws SecurityException, RuntimeException + { + final Context ctx = StaticContext.getContext(); + if(null != ctx) { + final File tmpRoot = ctx.getDir("temp", Context.MODE_WORLD_READABLE); + if(null==tmpRoot|| !tmpRoot.isDirectory() || !tmpRoot.canWrite()) { + throw new RuntimeException("Not a writable directory: '"+tmpRoot+"', retrieved Android static context"); + } + if(DEBUG) { + System.err.println("IOUtil.getTempRoot(Android): temp dir: "+tmpRoot.getAbsolutePath()); + } + return tmpRoot; + } + return null; + } + +} diff --git a/src/java/jogamp/common/os/android/PackageInfoUtil.java b/src/java/jogamp/common/os/android/PackageInfoUtil.java deleted file mode 100644 index 28795a1..0000000 --- a/src/java/jogamp/common/os/android/PackageInfoUtil.java +++ /dev/null @@ -1,63 +0,0 @@ -/** - * Copyright 2011 JogAmp Community. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of JogAmp Community. - */ -package jogamp.common.os.android; - -import android.content.*; -import android.content.pm.*; -import android.util.Log; - -public class PackageInfoUtil { - private static boolean DEBUG = false; - - public static final PackageInfo getPackageInfo(String packageName) { - return getPackageInfo(StaticContext.getContext(), packageName); - } - - public static final PackageInfo getPackageInfo(Context ctx, String packageName) { - if(null != ctx) { - try { - final PackageInfo pi = ctx.getPackageManager().getPackageInfo(packageName, PackageManager.GET_META_DATA); - if(DEBUG) Log.d(MD.TAG, "getPackageInfo("+packageName+"): "+pi); - return pi; - } catch (Exception e) { if(DEBUG) { Log.d(MD.TAG, "getPackageInfo("+packageName+")", e); } } - } - if(DEBUG) Log.d(MD.TAG, "getPackageInfo("+packageName+"): NULL"); - return null; - } - - public static final int getPackageInfoVersionCode(String packageName) { - final PackageInfo pInfo = getPackageInfo(packageName); - return ( null != pInfo ) ? pInfo.versionCode : -1 ; - } - public static final String getPackageInfoVersionName(String packageName) { - final PackageInfo pInfo = getPackageInfo(packageName); - final String s = ( null != pInfo ) ? pInfo.versionName : null ; - if(DEBUG) Log.d(MD.TAG, "getPackageInfoVersionName("+packageName+"): "+s); - return s; - } -} diff --git a/src/java/jogamp/common/os/android/StaticContext.java b/src/java/jogamp/common/os/android/StaticContext.java index 055fa2f..d7f134a 100644 --- a/src/java/jogamp/common/os/android/StaticContext.java +++ b/src/java/jogamp/common/os/android/StaticContext.java @@ -36,7 +36,10 @@ public class StaticContext { private static boolean DEBUG = false; /** + * Register Android application context for static usage. + * * @param appContext mandatory application Context + * @throws RuntimeException if the context is already registered. */ public static final synchronized void init(Context appContext) { if(null != StaticContext.appContext) { @@ -45,10 +48,19 @@ public class StaticContext { if(DEBUG) { Log.d(MD.TAG, "init(appCtx "+appContext+")"); } StaticContext.appContext = appContext; } + + /** + * Unregister the Android application Context + */ public static final synchronized void clear() { if(DEBUG) { Log.d(MD.TAG, "clear()"); } appContext = null; } + + /** + * Return the registered Android application Context + * @return + */ public static final synchronized Context getContext() { return appContext; } -- cgit v1.2.3