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

do much more logging in the initialization process. Account for differences in application path when seen from aab vs apk viewpoint.

Browse Source
This commit is contained in:
idk
2022-03-02 17:22:55 -05:00
parent 68f44b8ec1
commit d7f79e7b0b
1 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
app/src/main/java/net/i2p/android/InitActivities.java
View File

@ -59,6 +59,7 @@ class InitActivities {
} }
void initialize() { void initialize() {
Util.i("Initializing the I2P resources");
if (checkNewVersion()) { if (checkNewVersion()) {
List<Properties> lProps = Util.getPropertiesFromPreferences(ctx); List<Properties> lProps = Util.getPropertiesFromPreferences(ctx);
@ -131,9 +132,9 @@ class InitActivities {
File certDir = new File(myDir, "certificates"); File certDir = new File(myDir, "certificates");
certDir.mkdir(); certDir.mkdir();
File certificates = new File(myDir, "certificates"); File certificates = new File(myDir, "certificates");
File[] allcertificates = certificates.listFiles(); File[] allCertificates = certificates.listFiles();
if ( allcertificates != null) { if ( allCertificates != null) {
for (File f : allcertificates) { for (File f : allCertificates) {
Util.d("Deleting old certificate file/dir " + f); Util.d("Deleting old certificate file/dir " + f);
FileUtil.rmdir(f, false); FileUtil.rmdir(f, false);
} }
@ -178,10 +179,16 @@ class InitActivities {
out.write(buf, 0, read); out.write(buf, 0, read);
} catch (IOException ioe) { } catch (IOException ioe) {
Util.e("copyResourceToFile" + "IOE: ", ioe);
} catch (Resources.NotFoundException nfe) { } catch (Resources.NotFoundException nfe) {
Util.e("copyResourceToFile" + "NFE: ", nfe);
} finally { } finally {
if (in != null) try { in.close(); } catch (IOException ioe) {} if (in != null) try { in.close(); } catch (IOException ioe) {
if (out != null) try { out.close(); } catch (IOException ioe) {} Util.e("copyResourceToFile" + "IOE in.close(): ", ioe);
}
if (out != null) try { out.close(); } catch (IOException ioe) {
Util.e("copyResourceToFile" + "IOE out.close(): ", ioe);
}
} }
} }
/** /**
@ -192,7 +199,7 @@ class InitActivities {
FileOutputStream out = null; FileOutputStream out = null;
ZipInputStream zis = null; ZipInputStream zis = null;
Util.d("Creating files in '" + myDir + "/" + folder + "/' from resource"); Util.i("Creating files in '" + myDir + "/" + folder + "/' from resource");
try { try {
// Context methods // Context methods
in = ctx.getResources().openRawResource(resID); in = ctx.getResources().openRawResource(resID);
@ -209,30 +216,48 @@ class InitActivities {
} }
String name = ze.getName(); String name = ze.getName();
File f = new File(myDir + "/" + folder +"/" + name); File f = new File(myDir + "/" + folder +"/" + name);
String canonicalPath = f.getCanonicalPath(); String canonicalPath = f.getCanonicalPath().replace("/user/0/", "/data/");
if (!canonicalPath.startsWith(myDir)) { // account for canonical path differences when using .aab bundles
if (!canonicalPath.startsWith(myDir.replace("/user/0/", "/data/"))) {
// If these don't match, there's a path-traversal possibility. // If these don't match, there's a path-traversal possibility.
// So ignore it. // So ignore it.
Util.e("Path mismatch bug " + canonicalPath.toString() + " " + myDir.toString());
} else if (ze.isDirectory()) { } else if (ze.isDirectory()) {
Util.d("Creating directory " + myDir + "/" + folder +"/" + name + " from resource"); Util.i("Creating directory " + myDir + "/" + folder +"/" + name + " from resource");
f.mkdir(); f.mkdir();
} else { } else {
Util.d("Creating file " + myDir + "/" + folder +"/" + name + " from resource"); Util.i("Creating file " + myDir + "/" + folder +"/" + name + " from resource");
byte[] bytes = baos.toByteArray(); byte[] bytes = baos.toByteArray();
out = new FileOutputStream(f); out = new FileOutputStream(f);
out.write(bytes); out.write(bytes);
} }
} catch (IOException ioe) { } catch (IOException ioe) {
Util.e("unzipResourceToDir" + "IOE: ", ioe);
} finally { } finally {
if (out != null) { try { out.close(); } catch (IOException ioe) {} out = null; } if (out != null) {
try {
out.close();
} catch (IOException ioe) {
Util.e("unzipResourceToDir" + "IOE: interior out.close ", ioe);
}
out = null;
}
} }
} }
} catch (IOException ioe) { } catch (IOException ioe) {
Util.e("unzipResourceToDir" + "IOE: ", ioe);
} catch (Resources.NotFoundException nfe) { } catch (Resources.NotFoundException nfe) {
Util.e("unzipResourceToDir" + "NFE: ", nfe);
} finally { } finally {
if (in != null) try { in.close(); } catch (IOException ioe) {} if (in != null) try { in.close(); } catch (IOException ioe) {
if (out != null) try { out.close(); } catch (IOException ioe) {} Util.e("unzipResourceToDir" + "IOE: in.close() ", ioe);
if (zis != null) try { zis.close(); } catch (IOException ioe) {} }
if (out != null) try { out.close(); } catch (IOException ioe) {
Util.e("unzipResourceToDir" + "IOE: out.close() ", ioe);
}
if (zis != null) try { zis.close(); } catch (IOException ioe) {
Util.e("unzipResourceToDir" + "IOE: zis.close() ", ioe);
}
} }
} }