echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Android API version detection, load cacerts dir for API >= 14

Browse Source
This commit is contained in:
str4d
2014-03-07 08:27:14 +00:00
parent 8c820bb237
commit 2b0dfed012
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/src/net/i2p/crypto/KeyStoreUtil.java
View File

@ -94,9 +94,14 @@ public class KeyStoreUtil {
success = loadCerts(new File(override), ks); success = loadCerts(new File(override), ks);
if (!success) { if (!success) {
if (SystemVersion.isAndroid()) { if (SystemVersion.isAndroid()) {
// thru API 13. As of API 14 (ICS), the file is gone, but if (SystemVersion.getAndroidVersion() >= 14) {
// ks.load(null, pw) will bring in the default certs? try {
ks.load(null, DEFAULT_KEYSTORE_PASSWORD.toCharArray());
success = addCerts(new File(System.getProperty("java.home"), "etc/security/cacerts"), ks) > 0;
} catch (Exception e) {}
} else {
success = loadCerts(new File(System.getProperty("java.home"), "etc/security/cacerts.bks"), ks); success = loadCerts(new File(System.getProperty("java.home"), "etc/security/cacerts.bks"), ks);
}
} else { } else {
success = loadCerts(new File(System.getProperty("java.home"), "lib/security/jssecacerts"), ks); success = loadCerts(new File(System.getProperty("java.home"), "lib/security/jssecacerts"), ks);
if (!success) if (!success)

2
core/java/src/net/i2p/util/SystemVersion.java
View File

@ -47,7 +47,7 @@ public abstract class SystemVersion {
int sdk = 0; int sdk = 0;
if (_isAndroid) { if (_isAndroid) {
try { try {
Class<?> ver = Class.forName("android.os.Build.VERSION", true, ClassLoader.getSystemClassLoader()); Class<?> ver = Class.forName("android.os.Build$VERSION", true, ClassLoader.getSystemClassLoader());
Field field = ver.getField("SDK_INT"); Field field = ver.getField("SDK_INT");
sdk = field.getInt(null); sdk = field.getInt(null);
} catch (Exception e) {} } catch (Exception e) {}