- Enable SSL reseed

- Update README.txt and release notes
- Add irc.killyourtv.i2p to IRC list
- Use new buildI2PTunnelJar target
- LogWriter cleanup

README.txt

@@ -9,6 +9,17 @@ or else add i2psrc=/path/to/source in the local.properties file.
 
 =====================
 
+Dependencies:
+
+- Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
+- Apache Ant 1.8.0 or higher
+- I2P source in ../i2p.i2p
+- Android SDK (tested with Rev 20 and platform-tools version 12)
+
+=====================
+
+Instructions:
+
 # Download the SDK from http://developer.android.com/sdk/index.html
 # Unzip the android SDK in ../
 # So then the android tools will be in ../android-sdk-linux/tools/
@@ -26,10 +37,10 @@ or else add i2psrc=/path/to/source in the local.properties file.
 # To run the debugger (ddms) you also need to download the
 # "Android SDK Platform-Tools" package from the GUI updater.
 
-# create a file local.properties with the following line (without the leading # of course):
+# create a file local.properties with the following line (without the leading # of course),
+# do NOT use a relative path
 # sdk.dir=/path/to/your/android-sdk-linux
-# The old property was sdk-location=/path/to/your/android-sdk-linux
-# but it changed in more recent tools.
+# Copy this file to the routerjars/ directory, it is needed in both places.
 
 # DO NOT create a new project or anything. It's all set up right here for you.
 

res/raw/i2ptunnel_config

@@ -22,13 +22,13 @@ tunnel.0.option.outbound.lengthVariance=1
 tunnel.0.startOnLoad=true
 
 # irc
-tunnel.1.name=IRC Proxy postman/freshcoffee
+tunnel.1.name=IRC Proxy postman/freshcoffee/kytv
 tunnel.1.description=IRC proxy to access anonymous IRC servers
 tunnel.1.type=ircclient
 tunnel.1.sharedClient=true
 tunnel.1.interface=127.0.0.1
 tunnel.1.listenPort=6668
-tunnel.1.targetDestination=irc.postman.i2p,irc.freshcoffee.i2p
+tunnel.1.targetDestination=irc.postman.i2p,irc.freshcoffee.i2p,irc.killyourtv.i2p
 tunnel.1.i2cpHost=127.0.0.1
 tunnel.1.i2cpPort=7654
 tunnel.1.option.inbound.nickname=shared clients

res/raw/releasenotes_txt

@@ -16,7 +16,7 @@ The app uses TCP only for router-router connections, with a maximum of 24 simult
 
 UPnP is disabled. With UDP disabled also, you do not publish an IP address and should not be getting incoming connections.
 
-NTP is disabled. If you have cell service, your phone or tablet should have the correct time. If you do not have cell service, ensure your device has accurate time.
+I2P's NTP is disabled for API 11 (Honeycomb) and above, as those versions include NTP support. If you have cell service, your phone or tablet should have the correct time. If you do not have cell service, ensure your device has accurate time.
 
 The app will work best when you are not changing IPs. If you are moving around, changing WIFI nodes, or switching between mobile and WIFI networks, it won't work well.
 
@@ -28,7 +28,7 @@ Embedded web browser
 
 The browser does not use the outproxy for regular web sites. Javascript is disabled.
 
-The following problems with eepsites are probably not fixable except on Android 3.0 (Honeycomb - i.e. tablets) due to API limitations. I don't have a tablet to test on, so I haven't made any effort to work on it. The workaround is to use Firefox Mobile 4 and the ProxMob plugin (see below).
+The following problems with eepsites are probably not fixable except on Android 3.0 (Honeycomb - i.e. tablets) and higher due to API limitations. I don't have a tablet to test on, so I haven't made any effort to work on it. The workaround is to use Firefox Mobile 4 and the ProxMob plugin (see below).
   - Leaks .i2p DNS requests
   - Can't load cross-site images or CSS
   - No POSTs to forms
@@ -52,7 +52,7 @@ The app starts an HTTP proxy at localhost port 4444 and transparent IRC proxies
 The HTTP proxy should work with Firefox 4 Mobile and the ProxyMob Firefox plugin, if you have at least 512 MB of RAM. If it works it should avoid all the problems with the embedded web browser listed above. I can't test it as I have a 256 MB Droid.
 
 The IRC proxy is tested with the "Android IRC Free" app. The IRC proxy destinations are:
-  * Port 6668: irc.postman.i2p and irc.freshcoffee.i2p
+  * Port 6668: IRC2P - irc.postman.i2p, irc.freshcoffee.i2p, and irc.killyourtv.i2p
   * Port 6669: irc.welterde.i2p
   * Port 6670: irc.telecomix.i2p
 
@@ -60,7 +60,6 @@ The IRC proxy is tested with the "Android IRC Free" app. The IRC proxy destinati
 Further anonymity warnings
 --------------------------
 
-* Reseeding is via http
 * Exploratory and Client Tunnels are 1 hop + 0-1 hops
 * Sharing IRC and HTTP proxies on same tunnels allows for linking
 * Not well-tested

res/raw/router_config

@@ -54,3 +54,6 @@ i2np.udp.maxConnections=12
 # not on android
 i2np.upnp.enable=false
 routerconsole.geoip.enable=false
+#
+# false is default but was true in 0.9.1-0_b1 release so have to set it back
+router.reseedSSLDisable=false

routerjars/custom_rules.xml

@@ -43,7 +43,7 @@
         <!-- build router and core -->
         <ant dir="${i2pbase}" inheritall="false" useNativeBasedir="true" >
             <target name="buildRouter" />
-            <target name="buildI2PTunnel" />
+            <target name="buildI2PTunnelJar" />
             <target name="buildAddressbook" />
             <target name="buildBOB" />
         </ant>

src/net/i2p/util/LogWriter.java

@@ -179,17 +179,4 @@ class LogWriter implements Runnable {
             return android.util.Log.ERROR;
         }
     }
-
-    // not even used yet.
-    private static /* final */ String replace(String pattern, int num) {
-        char c[] = pattern.toCharArray();
-        StringBuilder buf = new StringBuilder();
-        for (int i = 0; i < c.length; i++) {
-            if ( (c[i] != '#') && (c[i] != '@') )
-                buf.append(c[i]);
-            else
-                buf.append(num);
-        }
-        return buf.toString();
-    }
 }