I2P_Developers/i2p.android.base
3
0
Fork 2
Code Issues 39 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

do it the easy way

Browse Source
This commit is contained in:
zzz
2010-12-13 15:28:06 +00:00
parent 2880d61c1b
commit 59af763dcd
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java
View File

@ -3,6 +3,7 @@ package net.i2p.router.web;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
import net.i2p.crypto.TrustedUpdate; import net.i2p.crypto.TrustedUpdate;
import net.i2p.data.DataHelper; import net.i2p.data.DataHelper;
import net.i2p.util.FileUtil;
/** /**
* *
@ -61,19 +62,10 @@ public class ConfigUpdateHandler extends FormHandler {
public static final String DEFAULT_UPDATE_URL; public static final String DEFAULT_UPDATE_URL;
static { static {
String foo; if (FileUtil.isPack200Supported())
try { DEFAULT_UPDATE_URL = PACK200_URLS;
Class.forName("java.util.jar.Pack200", false, ClassLoader.getSystemClassLoader()); else
foo = PACK200_URLS; DEFAULT_UPDATE_URL = NO_PACK200_URLS;
} catch (ClassNotFoundException cnfe) {
try {
Class.forName("org.apache.harmony.unpack200.Archive", false, ClassLoader.getSystemClassLoader());
foo = PACK200_URLS;
} catch (ClassNotFoundException cnfe2) {
foo = NO_PACK200_URLS;
}
}
DEFAULT_UPDATE_URL = foo;
} }
public static final String PROP_TRUSTED_KEYS = "router.trustedUpdateKeys"; public static final String PROP_TRUSTED_KEYS = "router.trustedUpdateKeys";

3
core/java/src/net/i2p/util/FileUtil.java
View File

@ -231,9 +231,10 @@ public class FileUtil {
} }
/** /**
* Public since 0.8.3
* @since 0.8.1 * @since 0.8.1
*/ */
private static boolean isPack200Supported() { public static boolean isPack200Supported() {
try { try {
Class.forName("java.util.jar.Pack200", false, ClassLoader.getSystemClassLoader()); Class.forName("java.util.jar.Pack200", false, ClassLoader.getSystemClassLoader());
return true; return true;