diff options
author | Sven Gothel <[email protected]> | 2012-06-04 04:36:52 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2012-06-04 04:36:52 +0200 |
commit | b3c9951006f9bd863244f1db3d54ac7866d66f0a (patch) | |
tree | e912f13991c3db98dacd48faadeb9ef9afa65a40 /src/java/jogamp/common/os/android | |
parent | 4074b34c5edbd11d3ab3fe32678de77816a0a16b (diff) |
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.
Diffstat (limited to 'src/java/jogamp/common/os/android')
-rw-r--r-- | src/java/jogamp/common/os/android/AndroidUtilsImpl.java (renamed from src/java/jogamp/common/os/android/PackageInfoUtil.java) | 38 | ||||
-rw-r--r-- | src/java/jogamp/common/os/android/StaticContext.java | 12 |
2 files changed, 45 insertions, 5 deletions
diff --git a/src/java/jogamp/common/os/android/PackageInfoUtil.java b/src/java/jogamp/common/os/android/AndroidUtilsImpl.java index 28795a1..f6a1444 100644 --- a/src/java/jogamp/common/os/android/PackageInfoUtil.java +++ b/src/java/jogamp/common/os/android/AndroidUtilsImpl.java @@ -27,11 +27,15 @@ */ package jogamp.common.os.android; -import android.content.*; -import android.content.pm.*; +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 PackageInfoUtil { +public class AndroidUtilsImpl { private static boolean DEBUG = false; public static final PackageInfo getPackageInfo(String packageName) { @@ -53,11 +57,35 @@ public class PackageInfoUtil { 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 <code>temp</code> 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/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; } |