Streaming: Workaround for jwebcache and i2phex (ticket #1231)

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

@@ -225,7 +225,10 @@ public class I2PSocketManagerFactory {
 
     private static I2PSocketManager createManager(I2PSession session, Properties opts, String name) {
         I2PAppContext context = I2PAppContext.getGlobalContext();
-        String classname = opts.getProperty(PROP_MANAGER, DEFAULT_MANAGER);
+        // As of 0.9.12, ignore this setting, as jwebcache and i2phex set it to the old value.
+        // There is no other valid manager.
+        //String classname = opts.getProperty(PROP_MANAGER, DEFAULT_MANAGER);
+        String classname = DEFAULT_MANAGER;
         try {
             Class<?> cls = Class.forName(classname);
             if (!I2PSocketManager.class.isAssignableFrom(cls))

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

@@ -0,0 +1,13 @@
+package net.i2p.client.streaming;
+
+/**
+ *  Moved to net.i2p.client.streaming.impl in 0.9.10.
+ *  Restored as a dummy class in 0.9.12, as i2phex imports it and
+ *  calls I2PSocketManagerFull.class.getName() to pass to I2PSocketManagerFactory.
+ *  I2PSocketManagerFactory ignores the class setting as of 0.9.12.
+ *  This does not implement I2PSocketManager. Do not use.
+ *
+ *  @since 0.9.12
+ *  @deprecated
+ */
+public class I2PSocketManagerFull {}

history.txt

@@ -1,6 +1,8 @@
 2014-03-12 zzz
  * Console: Handle ISO-639-2 language codes (ticket #1229)
- * Streaming: Track recently closed connections (ticket #1161)
+ * Streaming:
+   - Track recently closed connections (ticket #1161)
+   - Workaround for jwebcache and i2phex (ticket #1231)
  * Wrapper: Fix failed restarts on ARM (ticket #1230)
 
 2014-03-08 zzz

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 = 17;
+    public final static long BUILD = 18;
 
     /** for example "-test" */
     public final static String EXTRA = "";