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

Tweaks after upstream changes

Browse Source
This commit is contained in:
str4d
2015-03-12 00:07:35 +00:00
parent d2fa17fa66
commit 4b1ee639b7
2 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/net/i2p/android/i2ptunnel/util/TunnelUtil.java
View File

@ -327,10 +327,10 @@ public abstract class TunnelUtil {
cfg.setStartOnLoad(autoStart);
// Set sensible defaults for a new tunnel
cfg.setTunnelDepth(3);
cfg.setTunnelVariance(0);
cfg.setTunnelQuantity(2);
cfg.setTunnelBackupQuantity(0);
cfg.setTunnelDepth(res.getInteger(R.integer.DEFAULT_TUNNEL_LENGTH));
cfg.setTunnelVariance(res.getInteger(R.integer.DEFAULT_TUNNEL_VARIANCE));
cfg.setTunnelQuantity(res.getInteger(R.integer.DEFAULT_TUNNEL_QUANTITY));
cfg.setTunnelBackupQuantity(res.getInteger(R.integer.DEFAULT_TUNNEL_BACKUP_QUANTITY));
cfg.setClientHost("internal");
cfg.setClientPort("internal");
cfg.setCustomOptions("");
@ -339,28 +339,28 @@ public abstract class TunnelUtil {
cfg.setReduceCount(1);
cfg.setReduceTime(20);
}
if (TunnelUtil.isClient(type)) { /* Client-only defaults */
if (isClient(type)) { /* Client-only defaults */
if (!"streamrclient".equals(type)) {
cfg.setNewDest("0");
cfg.setNewDest(0);
cfg.setCloseTime(30);
}
if ("httpclient".equals(type) ||
"connectclient".equals(type) ||
"sockstunnel".equals(type) |
"socksirctunnel".equals(type)) {
cfg.setProxyAuth("false");
cfg.setProxyUsername("");
cfg.setProxyPassword("");
cfg.setOutproxyAuth("false");
cfg.setOutproxyUsername("");
cfg.setOutproxyPassword("");
}
if ("httpclient".equals(type))
cfg.setJumpList("http://i2host.i2p/cgi-bin/i2hostjump?\nhttp://stats.i2p/cgi-bin/jump.cgi?a=");
cfg.setJumpList(res.getString(R.string.DEFAULT_JUMP_LIST));
} else { /* Server-only defaults */
cfg.setPrivKeyFile(TunnelUtil.getPrivateKeyFile(tcg, -1));
cfg.setEncrypt();
cfg.setEncryptKey("");
cfg.setAccessMode("0");
cfg.setAccessList("");
cfg.setPrivKeyFile(getPrivateKeyFile(tcg, -1));
cfg.setEncrypt(false);
cfg.setAccessMode(0);
cfg.setLimitMinute(0);
cfg.setLimitHour(0);
cfg.setLimitDay(0);

13
app/src/main/res/values/defaults.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="DEFAULT_SHARED_CLIENTS">true</bool>
<bool name="DEFAULT_START_ON_LOAD">true</bool>
<integer name="DEFAULT_TUNNEL_LENGTH">3</integer>
<integer name="DEFAULT_TUNNEL_VARIANCE">0</integer>
<integer name="DEFAULT_TUNNEL_QUANTITY">2</integer>
<integer name="DEFAULT_TUNNEL_BACKUP_QUANTITY">0</integer>
<string name="DEFAULT_JUMP_LIST">http://i2host.i2p/cgi-bin/i2hostjump?
http://stats.i2p/cgi-bin/jump.cgi?a=</string>
</resources>