merge of '96f925faf1d190d7b7d71c043d3b73853cc7a9f7'

     and 'a081d5b6c58932415d009872ca843b36587fc455'

res/raw/releasenotes_txt

 ******* Please read all of the following *******
 
-This is the second alpha release of the I2P Android app.
+This is an alpha release of the I2P Android app.
 
 WARNING - This is ALPHA SOFTWARE. It may crash your phone. Do not rely upon it for strong anonymity. Tunnels may be as short as one hop. There may be serious security holes in the app.
 
-Minimum Android OS is 2.2 (API 8). The app is only tested on the Motorola Droid. It uses a lot of RAM. You need at least 256 MB of RAM. 512 should be much better.
+Minimum Android OS is 2.2 (API 8). It uses a lot of RAM. You need at least 256 MB of RAM. 512 should be much better.
 
 The app may use a lot of RAM even after the router has stopped and there is no icon in the notification bar. Go to Settings -> Applications -> Running Services and stop the I2P service if necessary. Or Settings -> Applications -> Manage Applications -> Running -> I2P and force stop.
 
-The app may be moved to the SD card if you have Froyo (2.2) or higher. The app does not store any files on the SD card.
+The app may be moved to the SD card. The app does not store any files on the SD card.
 
 The app runs on either WIFI or mobile networks. For now, the app is very low bandwidth, as it does not allow participating tunnels. It does not route traffic for other routers.
 

res/raw/router_config

@@ -20,6 +20,7 @@ i2cp.disableInterface=true
 # Todo: implement a NamingService using the android native SQLite
 #
 i2p.naming.impl=net.i2p.client.naming.HostsTxtNamingService
+i2p.hostsfilelist=hosts.txt
 #
 ##### Tunnels
 #
@@ -49,8 +50,6 @@ i2np.ntcp.maxConnections=24
 i2np.udp.enable=false
 i2np.udp.maxConnections=12
 #
-# no COMM at all!!!
-#i2p.vmCommSystem=true
 #
 # not on android
 i2np.upnp.enable=false

src/net/i2p/android/router/activity/Init.java

@@ -63,6 +63,12 @@ class Init {
             Properties props = new Properties();
             props.setProperty("i2p.dir.temp", myDir + "/tmp");
             props.setProperty("i2p.dir.pid", myDir + "/tmp");
+            // Time disabled in default router.config
+            // But lots of time problems on Android, not all carriers support NITZ
+            // and there was no NTP before 3.0. Tablets should be fine?
+            // Phones in airplane mode with wifi enabled still a problem.
+            if (Build.VERSION.SDK_INT < 11)  // Honeycomb 3.0
+                props.setProperty("time.disabled", "false");
             mergeResourceToFile(R.raw.router_config, "router.config", props);
             mergeResourceToFile(R.raw.logger_config, "logger.config", null);
             mergeResourceToFile(R.raw.i2ptunnel_config, "i2ptunnel.config", null);

src/net/i2p/android/router/receiver/I2PReceiver.java

@@ -38,7 +38,7 @@ public class I2PReceiver extends BroadcastReceiver {
 
     public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
-        Util.w("Got broadcast: " + action);
+        //Util.w("Got broadcast: " + action);
 
         if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
             boolean failover = intent.getBooleanExtra(ConnectivityManager.EXTRA_IS_FAILOVER, false);