From b3c9951006f9bd863244f1db3d54ac7866d66f0a Mon Sep 17 00:00:00 2001
From: Sven Gothel temp
folder relative to the applications local folder
* (see {@link Context#getDir(String, int)}) is returned, if
* the Android application/activity has registered it's Application Context
- * via {@link StaticContext#init(Context, ClassLoader)}.
+ * via {@link jogamp.common.os.android.StaticContext.StaticContext#init(Context, ClassLoader) StaticContext.init(..)}.
* This allows using the temp folder w/o the need for sdcard
* access, which would be the java.io.tempdir
location on Android!
*
java.io.tmpdir
or the resulting temp directory is invalid
*
* @see PropertyAccess#getProperty(String, boolean, java.security.AccessControlContext)
- * @see StaticContext#init(Context, ClassLoader)
* @see Context#getDir(String, int)
*/
public static File getTempRoot(AccessControlContext acc)
throws SecurityException, RuntimeException
{
- if(AndroidVersion.isAvailable) {
- 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());
- }
+ {
+ final File tmpRoot = AndroidUtils.getTempRoot(acc); // null if ( !Android || no android-ctx )
+ if(null != tmpRoot) {
return tmpRoot;
}
}
@@ -670,7 +659,7 @@ public class IOUtil {
throw new RuntimeException("Not a writable directory: '"+tmpRoot+"', retrieved by propery '"+java_io_tmpdir_propkey+"'");
}
if(DEBUG) {
- System.err.println("IOUtil.getTempRoot(isAndroid: "+AndroidVersion.isAvailable+"): temp dir: "+tmpRoot.getAbsolutePath());
+ System.err.println("IOUtil.getTempRoot(): temp dir: "+tmpRoot.getAbsolutePath());
}
return tmpRoot;
}
diff --git a/src/java/com/jogamp/common/util/JogampVersion.java b/src/java/com/jogamp/common/util/JogampVersion.java
index 2461c3e..de65f90 100644
--- a/src/java/com/jogamp/common/util/JogampVersion.java
+++ b/src/java/com/jogamp/common/util/JogampVersion.java
@@ -29,7 +29,6 @@
package com.jogamp.common.util;
import com.jogamp.common.GlueGenVersion;
-import com.jogamp.common.os.AndroidVersion;
import com.jogamp.common.os.Platform;
import java.util.Iterator;
@@ -37,7 +36,7 @@ import java.util.Set;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
-import jogamp.common.os.android.PackageInfoUtil;
+import jogamp.common.os.AndroidUtils;
public class JogampVersion {
@@ -48,7 +47,7 @@ public class JogampVersion {
private Manifest mf;
private int hash;
private Attributes mainAttributes;
- private Set/*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