Some files didn't upload to latest version.

app/src/main/java/org/ethereum/ethereum_android/EthereumApplication.java

@@ -11,9 +11,6 @@ import org.ethereum.ethereum_android.di.components.ApplicationComponent;
 import org.ethereum.ethereum_android.di.components.DaggerApplicationComponent;
 import org.ethereum.ethereum_android.di.modules.ApplicationModule;
 
-/**
- * Created by userica on 20.05.2015.
- */
 public class EthereumApplication extends MultiDexApplication {
 
     private ApplicationComponent applicationComponent = null;
@@ -35,4 +32,4 @@ public class EthereumApplication extends MultiDexApplication {
         return applicationComponent;
     }
 
-}
+}

app/src/main/java/org/ethereum/ethereum_android/di/PerActivity.java

@@ -6,9 +6,6 @@ import javax.inject.Scope;
 
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-/**
- * Created by userica on 22.05.2015.
- */
 @Scope
 @Retention(RUNTIME)
-public @interface PerActivity {}
+public @interface PerActivity {}

app/src/main/java/org/ethereum/ethereum_android/di/components/ActivityComponent.java

@@ -7,12 +7,9 @@ import dagger.Component;
 import org.ethereum.ethereum_android.di.PerActivity;
 import org.ethereum.ethereum_android.di.modules.ActivityModule;
 
-/**
- * Created by Adrian Tiberius on 20.05.2015.
- */
 @PerActivity
 @Component(dependencies = ApplicationComponent.class, modules = ActivityModule.class)
 public interface ActivityComponent {
 
     Activity activity();
-}
+}

app/src/main/java/org/ethereum/ethereum_android/di/components/ApplicationComponent.java

@@ -9,9 +9,6 @@ import org.ethereum.facade.Ethereum;
 import dagger.Component;
 import javax.inject.Singleton;
 
-/**
- * Created by Adrian Tiberius on 20.05.2015.
- */
 @Singleton // Constraints this component to one-per-application or unscoped bindings.
 @Component(modules = ApplicationModule.class)
 public interface ApplicationComponent {
@@ -19,4 +16,4 @@ public interface ApplicationComponent {
 
     //Exposed to sub-graphs.
     Context context();
-}
+}

app/src/main/java/org/ethereum/ethereum_android/di/components/EthereumApplicationComponent.java

@@ -4,10 +4,7 @@ import android.content.Context;
 
 import org.ethereum.di.components.EthereumComponent;
 
-/**
- * Created by Adrian Tiberius on 20.05.2015.
- */
 public interface EthereumApplicationComponent extends EthereumComponent {
 
     Context context();
-}
+}

app/src/main/java/org/ethereum/ethereum_android/di/modules/ActivityModule.java

@@ -11,9 +11,6 @@ import javax.inject.Singleton;
 import dagger.Module;
 import dagger.Provides;
 
-/**
- * Created by Adrian Tiberius on 20.05.2015.
- */
 @Module
 public class ActivityModule {
 
@@ -30,4 +27,4 @@ public class ActivityModule {
     }
 
 
-}
+}

app/src/main/java/org/ethereum/ethereum_android/di/modules/ApplicationModule.java

@@ -11,9 +11,6 @@ import javax.inject.Singleton;
 import dagger.Module;
 import dagger.Provides;
 
-/**
- * Created by Adrian Tiberius on 20.05.2015.
- */
 @Module
 public class ApplicationModule {
 
@@ -29,4 +26,4 @@ public class ApplicationModule {
     }
 
 
-}
+}

ethereumj-core/src/main/java/org/ethereum/di/components/BlockchainComponent.java

@@ -7,10 +7,7 @@ import javax.inject.Singleton;
 
 import dagger.Component;
 
-/**
- * Created by Adrian Tiberius on 21.05.2015.
- */
 @Singleton
 @Component(modules = BlockchainModule.class)
 public interface BlockchainComponent {
-}
+}

ethereumj-core/src/main/java/org/ethereum/di/components/EthereumComponent.java

@@ -4,14 +4,12 @@ import android.content.Context;
 
 import org.ethereum.di.modules.EthereumModule;
 import org.ethereum.facade.Ethereum;
+import org.ethereum.listener.EthereumListener;
 
 import javax.inject.Singleton;
 
 import dagger.Component;
 
-/**
- * Created by Adrian Tiberius on 20.05.2015.
- */
 @Singleton
 @Component(modules = EthereumModule.class)
 public interface EthereumComponent {
@@ -20,4 +18,5 @@ public interface EthereumComponent {
 
     Context context();
     Ethereum ethereum();
-}
+    EthereumListener listener();
+}

ethereumj-core/src/main/java/org/ethereum/di/modules/EthereumModule.java

@@ -19,21 +19,23 @@ import org.ethereum.manager.AdminInfo;
 import org.ethereum.manager.BlockLoader;
 import org.ethereum.manager.WorldManager;
 import org.ethereum.net.BlockQueue;
+import org.ethereum.net.MessageQueue;
 import org.ethereum.net.client.PeerClient;
 import org.ethereum.net.eth.EthHandler;
+import org.ethereum.net.p2p.P2pHandler;
 import org.ethereum.net.peerdiscovery.PeerDiscovery;
 import org.ethereum.net.server.ChannelManager;
+import org.ethereum.net.server.EthereumChannelInitializer;
 import org.ethereum.net.shh.ShhHandler;
+import org.ethereum.net.wire.MessageCodec;
 import org.ethereum.vm.ProgramInvokeFactory;
 
+import javax.inject.Provider;
 import javax.inject.Singleton;
 
 import dagger.Module;
 import dagger.Provides;
 
-/**
- * Created by Adrian Tiberius on 20.05.2015.
- */
 @Module
 public class EthereumModule {
 
@@ -46,8 +48,8 @@ public class EthereumModule {
     @Provides
     @Singleton
     Ethereum provideEthereum(WorldManager worldManager, AdminInfo adminInfo, ChannelManager channelManager,
-                             BlockLoader blockLoader, PeerClient backupPeerClient) {
+                             BlockLoader blockLoader, Provider<PeerClient> peerClientProvider) {
-        return new EthereumImpl(worldManager, adminInfo, channelManager, blockLoader, backupPeerClient);
+        return new EthereumImpl(worldManager, adminInfo, channelManager, blockLoader, peerClientProvider);
     }
 
     @Provides
@@ -99,6 +101,18 @@ public class EthereumModule {
         return new PeerDiscovery();
     }
 
+    @Provides
+    @Singleton
+    ChannelManager provideChannelManager() {
+        return new ChannelManager();
+    }
+
+    @Provides
+    @Singleton
+    BlockLoader provideBlockLoader() {
+        return new BlockLoader();
+    }
+
     @Provides
     EthHandler provideEthHandler() {
         return new EthHandler();
@@ -109,15 +123,38 @@ public class EthereumModule {
         return new ShhHandler();
     }
 
+    @Provides
+    P2pHandler provideP2pHandler() {
+        return new P2pHandler();
+    }
+
+    @Provides
+    MessageCodec provideMessageCodec() {
+        return new MessageCodec();
+    }
+
+    @Provides
+    PeerClient providePeerClient(EthereumListener listener, ChannelManager channelManager,
+                                 Provider<EthereumChannelInitializer> ethereumChannelInitializerProvider) {
+        return new PeerClient(listener, channelManager, ethereumChannelInitializerProvider);
+    }
+
+    @Provides
+    MessageQueue provideMessageQueue() {
+        return new MessageQueue();
+    }
+
     @Provides
     @Singleton
     Context provideContext() {
         return context;
     }
 
+
+
     @Provides
     String provideRemoteId() {
-        return "e3d09d2f829950b5f3f82d1bddb6f5388bff2f2cca880fa47923df4d8129e8c9b5ba5d4371efcffc416b0cefe20cb55b81b2b71183464713a86e60b423b77947";
+        return "bf01b54b6bc7faa203286dfb8359ce11d7b1fe822968fb4991f508d6f5a36ab7d9ae8af9b0d61c0467fb08567e0fb71cfb9925a370b69f9ede97927db473d1f5";
     }