Updates after review:

Remove meeh.i2p as update host (ticket #1515)
Re-add 193.xxx https reseed
Fix SocketManagerFactory property handling
Restore UPnP locale fix lost in the merge
i2ptunnel finals
I2NP unique id fixes
duplicate done() in ReseedChecker
bigger langbox in CSS
reformatting
Javadocs

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java

@@ -44,6 +44,7 @@ public class TunnelController implements Logging {
     private List<I2PSession> _sessions;
     private volatile TunnelState _state;
 
+    /** @since 0.9.19 */
     private enum TunnelState {
         START_ON_LOAD,
         STARTING,
@@ -849,6 +850,7 @@ public class TunnelController implements Logging {
         return true;
     }
 
+    /** @since 0.9.19 */
     private synchronized void changeState(TunnelState state) {
         _state = state;
     }

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java

@@ -44,8 +44,8 @@ public class GeneralHelper {
 
     private static final String OPT = TunnelController.PFX_OPTION;
 
-    private I2PAppContext _context;
+    private final I2PAppContext _context;
-    protected TunnelControllerGroup _group;
+    protected final TunnelControllerGroup _group;
 
     public GeneralHelper(TunnelControllerGroup tcg) {
         this(I2PAppContext.getGlobalContext(), tcg);

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java

@@ -53,7 +53,7 @@ public class IndexBean {
     private String _curNonce;
     //private long _nextNonce;
 
-    private TunnelConfig _config;
+    private final TunnelConfig _config;
     private boolean _removeConfirmed;
     private int _hashCashValue;
     private int _certType;

apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java

@@ -227,7 +227,7 @@ public class I2PSocketManagerFactory {
         Properties syscopy = (Properties) System.getProperties().clone();
         for (Map.Entry<Object, Object> e : syscopy.entrySet()) {
             String name = (String) e.getKey();
-            if (opts.getProperty(name) != null)
+            if (opts.getProperty(name) == null)
                 opts.setProperty(name, (String) e.getValue());
         }
         // as of 0.8.1 (I2CP default is BestEffort)

apps/routerconsole/java/src/net/i2p/router/web/ConfigNavHelper.java

@@ -27,6 +27,7 @@ public class ConfigNavHelper extends HelperBase {
                                            _x("Clients"), _x("Peers"), _x("Keyring"), _x("Logging"), _x("Stats"),
                                            _x("Reseeding"), _x("Advanced") };
 
+    /** @since 0.9.19 */
     private static class Tab {
         public final String page, title;
         public Tab(String p, String t) {
@@ -34,6 +35,7 @@ public class ConfigNavHelper extends HelperBase {
         }
     }
 
+    /** @since 0.9.19 */
     private class TabComparator implements Comparator<Tab> {
          private static final long serialVersionUID = 1L;
          private final Collator coll;

apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java

@@ -69,7 +69,7 @@ public class ConfigUpdateHandler extends FormHandler {
     private static final String PACK200_URLS =
     "http://echelon.i2p/i2p/i2pupdate.su2\r\n" +
     "http://inr.i2p/i2p/i2pupdate.su2\r\n" +
-    "http://meeh.i2p/i2pupdate/i2pupdate.su2\r\n" +
+    //"http://meeh.i2p/i2pupdate/i2pupdate.su2\r\n" +
     "http://stats.i2p/i2p/i2pupdate.su2\r\n" +
     // "http://www.i2p2.i2p/_static/i2pupdate.su2\r\n" +
     "http://update.dg.i2p/files/i2pupdate.su2\r\n" +
@@ -79,7 +79,7 @@ public class ConfigUpdateHandler extends FormHandler {
     private static final String NO_PACK200_URLS =
     "http://echelon.i2p/i2p/i2pupdate.sud\r\n" +
     "http://inr.i2p/i2p/i2pupdate.sud\r\n" +
-    "http://meeh.i2p/i2pupdate/i2pupdate.sud\r\n" +
+    //"http://meeh.i2p/i2pupdate/i2pupdate.sud\r\n" +
     "http://stats.i2p/i2p/i2pupdate.sud\r\n" +
     // "http://www.i2p2.i2p/_static/i2pupdate.sud\r\n" +
     "http://update.dg.i2p/files/i2pupdate.sud\r\n" +
@@ -113,7 +113,7 @@ public class ConfigUpdateHandler extends FormHandler {
     private static final String DEFAULT_SU3_UPDATE_URLS =
     "http://echelon.i2p/i2p/i2pupdate.su3\r\n" +
     "http://inr.i2p/i2p/i2pupdate.su3\r\n" +
-    "http://meeh.i2p/i2pupdate/i2pupdate.su3\r\n" +
+    //"http://meeh.i2p/i2pupdate/i2pupdate.su3\r\n" +
     "http://stats.i2p/i2p/i2pupdate.su3\r\n" +
     // "http://www.i2p2.i2p/_static/i2pupdate.su3\r\n" +
     "http://update.dg.i2p/files/i2pupdate.su3\r\n" +

core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java

@@ -156,8 +156,7 @@ class IntelInfoImpl extends CPUIDCPUInfo implements IntelCPUInfo
                     isPentiumMCompatible = true;
                     isCore2Compatible = true;
                     isX64 = true;
-                }
+                    if (extmodel >= 2)
-                if (extmodel >= 2) {
                         isCoreiCompatible = true;
                 }
                 switch (model) {

core/java/src/net/i2p/crypto/SHA256Generator.java

@@ -77,9 +77,10 @@ public final class SHA256Generator {
             digest.digest(out, outOffset, Hash.HASH_LENGTH);
         } catch (DigestException e) {
             throw new RuntimeException(e);
-        }
+        } finally {
             release(digest);
         }
+    }
     
     private MessageDigest acquire() {
         MessageDigest rv = _digests.poll();

core/java/src/net/i2p/util/LogWriter.java

@@ -74,6 +74,9 @@ class LogWriter extends LogWriterBase {
         }
     }
 
+    /**
+     *  @since 0.9.19
+     */
     protected void flushWriter() {
         try {
             if (_currentOut != null)
@@ -84,6 +87,9 @@ class LogWriter extends LogWriterBase {
         }
     }
 
+    /**
+     *  @since 0.9.19 renamed from closeFile()
+     */
     protected void closeWriter() {
         Writer out = _currentOut;
         if (out != null) {

core/java/src/net/i2p/util/LogWriterBase.java

@@ -16,6 +16,7 @@ import java.util.Queue;
  * the log.  This also periodically instructs the LogManager to reread its config
  * file.
  *
+ * @since 0.9.19 pulled from LogWriter so Android may extend
  */
 abstract class LogWriterBase implements Runnable {
     /** every 10 seconds? why? Just have the gui force a reread after a change?? */

core/java/src/net/i2p/util/NativeBigInteger.java

@@ -196,10 +196,9 @@ public class NativeBigInteger extends BigInteger {
     private final static String sCPUType; //The CPU Type to optimize for (one of the above strings)
     
     static {
-        if (_isX86) {// Don't try to resolve CPU type on non x86 hardware
+        if (_isX86) {  // Don't try to resolve CPU type on non x86 hardware
             sCPUType = resolveCPUType();
-        }
+        } else if (_isArm) {
-        else if (_isArm) {
             sCPUType = JBIGI_OPTIMIZATION_ARM;
         } else if (_isPPC && !_isMac) {
             sCPUType = JBIGI_OPTIMIZATION_PPC;

history.txt

@@ -1,3 +1,6 @@
+2015-04-11 zzz
+ * Updates after review
+
 2015-04-09 kytv
  * Updates to geoip.txt and geoipv6.dat.gz based on Maxmind GeoLite Country
    database from 2015-04-07.

installer/resources/themes/console/classic/console.css

@@ -995,7 +995,7 @@ p img:first-child {
      margin: 5px 5px 0 5px;
      color: #001;
      font-size: 7pt;
-     width: 320px;
+     width: 330px;
      text-align: right;
      float: right;
      valign: middle;

installer/resources/themes/console/dark/console.css

@@ -882,7 +882,7 @@ button:active {
      padding: 0;
      color: #EE9;
      font-size: 7pt;
-     width: 290px;
+     width: 300px;
      text-align: right;
      float: right;
      vertical-align: middle;

installer/resources/themes/console/light/console.css

@@ -1088,7 +1088,7 @@ button:active {
      padding: 2px 5px;
      color: #001;
      font-size: 7pt;
-     width: 320px;
+     width: 330px;
      text-align: right;
      float: right;
      vertical-align: middle;

router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java

@@ -256,7 +256,7 @@ public class DatabaseStoreMessage extends FastI2NPMessageImpl {
         StringBuilder buf = new StringBuilder();
         buf.append("[DatabaseStoreMessage: ");
         buf.append("\n\tExpiration: ").append(new Date(_expiration));
-        buf.append("\n\tUnique ID: ").append(_uniqueId);
+        buf.append("\n\tUnique ID: ").append(getUniqueId());
         if (_replyToken != 0) {
             buf.append("\n\tReply token: ").append(_replyToken);
             buf.append("\n\tReply tunnel: ").append(_replyTunnel);

router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java

@@ -31,6 +31,13 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
     protected final Log _log;
     protected final I2PAppContext _context;
     protected long _expiration;
+
+    /**
+     *  Warning, lazily initialized by readBytes(), writeBytes(), toByteArray(),
+     *  getUniqueId(), and setUniqueId(); otherwise will be -1.
+     *  Extending classes should take care when accessing this field;
+     *  to ensure initialization, use getUniqueId() instead.
+     */
     protected long _uniqueId = -1;
 
     public final static long DEFAULT_EXPIRATION_MS = 1*60*1000; // 1 minute by default
@@ -257,7 +264,7 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
     }
 
     /**
-     *  The ID is set to a random value in the constructor but it can be overridden here.
+     *  The ID is set to a random value when written but it can be overridden here.
      */
     public void setUniqueId(long id) { _uniqueId = id; }
 

router/java/src/net/i2p/data/i2np/TunnelDataMessage.java

@@ -234,7 +234,7 @@ public class TunnelDataMessage extends FastI2NPMessageImpl {
     public String toString() {
         StringBuilder buf = new StringBuilder();
         buf.append("[TunnelDataMessage:");
-        buf.append(" MessageId: ").append(_uniqueId);
+        buf.append(" MessageId: ").append(getUniqueId());
         buf.append(" Tunnel ID: ").append(_tunnelId);
         buf.append("]");
         return buf.toString();

router/java/src/net/i2p/router/Router.java

@@ -1508,7 +1508,7 @@ public class Router implements RouterClock.ClockShiftListener {
      * Context must be available.
      * Unzip update file found in the router dir OR base dir, to the base dir
      *
-     * If successfull, will call exit() and never return.
+     * If successful, will call exit() and never return.
      *
      * If we can't write to the base dir, complain.
      * Note: _log not available here.

router/java/src/net/i2p/router/RouterVersion.java

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 19;
+    public final static long BUILD = 20;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";

router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java

@@ -158,7 +158,6 @@ public class ReseedChecker {
             } catch (IOException ioe) {
                 if (ioe.getMessage() != null)
                     setError(DataHelper.escapeHTML(ioe.getMessage()));
-                done();
                 throw ioe;
             } finally {
                 done();

router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java

@@ -88,6 +88,7 @@ public class Reseeder {
               "https://netdb.rows.io:444/" + "," + // Only HTTPS and SU3 (v3) support
               "https://i2pseed.zarrenspry.info/" + "," + // Only HTTPS and SU3 (v3) support
               "https://i2p.mooo.com/netDb/" + "," +
+              "https://193.150.121.66/netDb/" + "," +
               "https://netdb.i2p2.no/" + "," + // Only SU3 (v3) support
               "https://us.reseed.i2p2.no:444/" + "," +
               "https://uk.reseed.i2p2.no:444/" + "," +

router/java/src/org/cybergarage/util/FileUtil.java

@@ -18,6 +18,7 @@ package org.cybergarage.util;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.util.Locale;
 
 public final class FileUtil
 {
@@ -72,7 +73,7 @@ public final class FileUtil
 	{
 		if (StringUtil.hasData(name) == false)
 			return false;
-		String lowerName = name.toLowerCase();
+		String lowerName = name.toLowerCase(Locale.US);
 		return lowerName.endsWith("xml");
 	}
 }