Fixed a few problems:

- some bugs that creeped in when I moved security into its own adapter
- improved some DB code as it doesn't work in Android anyway
- all entities should be serializable (very useful in Android)

demo/build.gradle

@@ -22,8 +22,10 @@ dependencies {
     compile project(':domain')
     compile project(':networking')
     compile project(':repositories')
+    compile project(':security-bc')
     compile project(':wif')
     compile 'org.slf4j:slf4j-simple:1.7.12'
     compile 'args4j:args4j:2.32'
+    compile 'com.h2database:h2:1.4.187'
     testCompile 'junit:junit:4.11'
 }

demo/src/main/java/ch/dissem/bitmessage/demo/Application.java

@@ -21,7 +21,9 @@ import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.networking.DefaultNetworkHandler;
+import ch.dissem.bitmessage.ports.MemoryNodeRegistry;
 import ch.dissem.bitmessage.repository.*;
+import ch.dissem.bitmessage.security.bc.BouncySecurity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,6 +48,7 @@ public class Application {
                 .nodeRegistry(new MemoryNodeRegistry())
                 .messageRepo(new JdbcMessageRepository(jdbcConfig))
                 .networkHandler(new DefaultNetworkHandler())
+                .security(new BouncySecurity())
                 .port(48444)
                 .build();
 

demo/src/main/java/ch/dissem/bitmessage/demo/Main.java

@@ -18,7 +18,9 @@ package ch.dissem.bitmessage.demo;
 
 import ch.dissem.bitmessage.BitmessageContext;
 import ch.dissem.bitmessage.networking.DefaultNetworkHandler;
+import ch.dissem.bitmessage.ports.MemoryNodeRegistry;
 import ch.dissem.bitmessage.repository.*;
+import ch.dissem.bitmessage.security.bc.BouncySecurity;
 import ch.dissem.bitmessage.wif.WifExporter;
 import ch.dissem.bitmessage.wif.WifImporter;
 import org.kohsuke.args4j.CmdLineException;
@@ -50,6 +52,7 @@ public class Main {
                     .nodeRegistry(new MemoryNodeRegistry())
                     .messageRepo(new JdbcMessageRepository(jdbcConfig))
                     .networkHandler(new DefaultNetworkHandler())
+                    .security(new BouncySecurity())
                     .port(48444)
                     .build();