Update I2NPMessageImpl.java

android/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="net.nightweb" android:versionCode="25" android:versionName="0.0.25">
+	package="net.nightweb" android:versionCode="26" android:versionName="0.0.26">
 
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

android/project.clj

@@ -1,4 +1,4 @@
-(defproject nightweb-android/Nightweb "0.0.25"
+(defproject nightweb-android/Nightweb "0.0.26"
   :license {:name "Public Domain"
             :url "http://unlicense.org/UNLICENSE"}
   :min-lein-version "2.0.0"
@@ -9,10 +9,10 @@
   :java-source-paths ["src/java" "../common/java" "gen"]
   :javac-options ["-target" "1.6" "-source" "1.6" "-Xlint:-options"]
 
-  :dependencies [[com.h2database/h2 "1.3.174"]
+  :dependencies [[com.h2database/h2 "1.3.175"]
                  [markdown-clj "0.9.36"]
-                 [neko/neko "3.0.0"]
-                 [org.clojure/java.jdbc "0.3.2"]
+                 [neko/neko "3.0.1"]
+                 [org.clojure/java.jdbc "0.3.3"]
                  [org.clojure-android/clojure "1.5.1-jb" :use-resources true]]
   :profiles {:dev {:dependencies [[android/tools.nrepl "0.2.0-bigstack"]]
                    :android {:aot :all-with-unused}}

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

@@ -64,7 +64,7 @@ public I2NPMessageImpl(I2PAppContext context) {
         _log = context.logManager().getLog(I2NPMessageImpl.class);
         _expiration = _context.clock().now() + DEFAULT_EXPIRATION_MS;
         // FIXME/TODO set only for outbound, or only on write, or something, to not waste entropy
-        _uniqueId = _context.random().nextLong(MAX_ID_VALUE);
+        _uniqueId = -1;
         //_context.statManager().createRateStat("i2np.writeTime", "How long it takes to write an I2NP message", "I2NP", new long[] { 10*60*1000, 60*60*1000 });
         //_context.statManager().createRateStat("i2np.readTime", "How long it takes to read an I2NP message", "I2NP", new long[] { 10*60*1000, 60*60*1000 });
     }
@@ -254,14 +254,19 @@ public void writeBytes(OutputStream out) throws DataFormatException, IOException
     public long getUniqueId() { return _uniqueId; }
 
     /**
-     *  The ID is set to a random value in the constructor but it can be overridden here.
+     *  The ID is set to -1 in the constructor. This will throw an error unless another ID is entered.
      */
     public void setUniqueId(long id) { _uniqueId = id; }
 
     /**
      * Date after which the message should be dropped (and the associated uniqueId forgotten)
      *
      */
+    public void setRandomId(){setUniqueId(_context.random().nextLong(MAX_ID_VALUE));}
+    /**
+     * Generates a random number and passes it to setUniqueID.
+     * /
+
     public long getMessageExpiration() { return _expiration; }
 
     /**

desktop/project.clj

@@ -1,12 +1,12 @@
-(defproject nightweb-desktop "0.0.25"
+(defproject nightweb-desktop "0.0.26"
   :license {:name "Public Domain"
             :url "http://unlicense.org/UNLICENSE"}
   :dependencies [[com.github.insubstantial/substance "7.2.1"]
-                 [com.h2database/h2 "1.3.174"]
-                 [hiccup "1.0.4"]
+                 [com.h2database/h2 "1.3.175"]
+                 [hiccup "1.0.5"]
                  [markdown-clj "0.9.36"]
                  [org.clojure/clojure "1.5.1"]
-                 [org.clojure/java.jdbc "0.3.2"]
+                 [org.clojure/java.jdbc "0.3.3"]
                  [ring "1.2.1"]
                  [seesaw "1.4.4"]]
   :source-paths ["src" "../common/clojure"]

server/project.clj

@@ -1,9 +1,9 @@
-(defproject nightweb-server/Nightweb "0.0.25"
+(defproject nightweb-server/Nightweb "0.0.26"
   :license {:name "Public Domain"
             :url "http://unlicense.org/UNLICENSE"}
   :dependencies [[org.clojure/clojure "1.5.1"]
-                 [org.clojure/java.jdbc "0.3.2"]
-                 [com.h2database/h2 "1.3.174"]]
+                 [org.clojure/java.jdbc "0.3.3"]
+                 [com.h2database/h2 "1.3.175"]]
   :source-paths ["src" "../common/clojure"]
   :java-source-paths ["../common/java"]
   :aot [nightweb-server.core]