Implemented UsbSerialAdapter for android.

2 files changed, 7 insertions, 1 deletions

diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/IntegrationModule.java b/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/IntegrationModule.java
index b06d9aa67..7fd86f537 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/IntegrationModule.java
+++ b/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/IntegrationModule.java
@@ -9,6 +9,7 @@ import com.twine.tango.integration.services.ISynchronizationService;
 import com.twine.tango.integration.services.ExternalBridgeService;
 import com.twine.tango.integration.services.SynchronizationService;
 import com.twine.tango.transport.adapters.TcpTransportAdapter;
+import com.twine.tango.transport.adapters.UsbTransportAdapter;
 
 import javax.inject.Singleton;
 import dagger.Module;
@@ -45,6 +46,7 @@ public class IntegrationModule
     @Singleton
     public IMachineOperator providerMachineOperator()
     {
-        return new MachineOperator(new TcpTransportAdapter("10.0.2.2", 9999));
+        //return new MachineOperator(new TcpTransportAdapter("10.0.2.2", 9999));
+        return new MachineOperator(new UsbTransportAdapter());
     }
 }
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/main/MainActivity.java b/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/main/MainActivity.java
index c2699c640..c1f85b971 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/main/MainActivity.java
+++ b/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/main/MainActivity.java
@@ -6,6 +6,8 @@ import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.view.View;
+
+import com.twine.tango.core.ContextHelper;
 import com.twine.tango.sharedui.containers.ActivityBase;
 import com.twine.tango.sharedui.navigation.INavigationProvider;
 import com.twine.tango.stubs.ui.App;
@@ -26,6 +28,8 @@ public class MainActivity extends ActivityBase<ActivityMainBinding, MainActivity
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
+        ContextHelper.registerMainActivity(this);
+        
         super.onCreate(savedInstanceState);
         
         navigationProvider.registerNavigationActivity(this, R.id.fragment_container, "com.twine.tango.stubs.ui.views");