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

Remove duplicate Debug, move wrapper.log delete to a better place.

Browse Source
This commit is contained in:
sponge
2012-08-03 02:37:40 +00:00
parent cc3b37c4c0
commit 39b54c41ab
3 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/net/i2p/android/router/activity/InitActivities.java
View File

@ -59,6 +59,7 @@ class InitActivities {
} }
void initialize() { void initialize() {
(new File(myDir, "wrapper.log")).delete();
if (checkNewVersion()) { if (checkNewVersion()) {
Properties props = new Properties(); Properties props = new Properties();
props.setProperty("i2p.dir.temp", myDir + "/tmp"); props.setProperty("i2p.dir.temp", myDir + "/tmp");

22
src/net/i2p/android/router/service/Init.java
View File

@ -19,38 +19,18 @@ class Init {
_ourVersion = Util.getOurVersion(c); _ourVersion = Util.getOurVersion(c);
} }
void debugStuff() {
Util.i("java.io.tmpdir" + ": " + System.getProperty("java.io.tmpdir"));
Util.i("java.vendor" + ": " + System.getProperty("java.vendor"));
Util.i("java.version" + ": " + System.getProperty("java.version"));
Util.i("os.arch" + ": " + System.getProperty("os.arch"));
Util.i("os.name" + ": " + System.getProperty("os.name"));
Util.i("os.version" + ": " + System.getProperty("os.version"));
Util.i("user.dir" + ": " + System.getProperty("user.dir"));
Util.i("user.home" + ": " + System.getProperty("user.home"));
Util.i("user.name" + ": " + System.getProperty("user.name"));
Util.i("getFilesDir()" + ": " + myDir);
Util.i("max mem" + ": " + DataHelper.formatSize(Runtime.getRuntime().maxMemory()));
Util.i("Package" + ": " + ctx.getPackageName());
Util.i("Version" + ": " + _ourVersion);
Util.i("MODEL" + ": " + Build.MODEL);
Util.i("DISPLAY" + ": " + Build.DISPLAY);
Util.i("VERSION" + ": " + Build.VERSION.RELEASE);
Util.i("SDK" + ": " + Build.VERSION.SDK);
}
void initialize() { void initialize() {
deleteOldFiles(); deleteOldFiles();
// Set up the locations so Router and WorkingDir can find them // Set up the locations so Router and WorkingDir can find them
// We do this again here, in the event settings were changed.
System.setProperty("i2p.dir.base", myDir); System.setProperty("i2p.dir.base", myDir);
System.setProperty("i2p.dir.config", myDir); System.setProperty("i2p.dir.config", myDir);
System.setProperty("wrapper.logfile", myDir + "/wrapper.log"); System.setProperty("wrapper.logfile", myDir + "/wrapper.log");
} }
private void deleteOldFiles() { private void deleteOldFiles() {
(new File(myDir, "wrapper.log")).delete();
File tmp = new File(myDir, "tmp"); File tmp = new File(myDir, "tmp");
File[] files = tmp.listFiles(); File[] files = tmp.listFiles();
if (files != null) { if (files != null) {

1
src/net/i2p/android/router/service/RouterService.java
View File

@ -60,7 +60,6 @@ public class RouterService extends Service {
_myDir = getFilesDir().getAbsolutePath(); _myDir = getFilesDir().getAbsolutePath();
// init other stuff here, delete log, etc. // init other stuff here, delete log, etc.
Init init = new Init(this); Init init = new Init(this);
init.debugStuff();
init.initialize(); init.initialize();
//_apkPath = init.getAPKPath(); //_apkPath = init.getAPKPath();
_statusBar = new StatusBar(this); _statusBar = new StatusBar(this);