Refactored Transporter Adapters collection to single adapter !

1 files changed, 6 insertions, 10 deletions

diff --git a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java b/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java
index 99e2293ae..4788a8082 100644
--- a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java
+++ b/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java
@@ -5,8 +5,6 @@ import android.net.DhcpInfo;
 import android.net.wifi.WifiManager;
 import android.os.StrictMode;
 import android.os.SystemClock;
-import android.provider.SyncStateContract.Constants;
-import android.util.Log;
 
 import com.elvishew.xlog.XLog;
 import com.google.protobuf.GeneratedMessageV3;
@@ -21,7 +19,6 @@ import com.twine.tango.pmr.common.MessageTypeOuterClass.MessageType;
 import com.twine.tango.pmr.integration.ExternalBridgeUdpDiscoveryPacketOuterClass.ExternalBridgeUdpDiscoveryPacket;
 import com.twine.tango.pmr.integration.ExternalClientLoginRequestOuterClass.ExternalClientLoginRequest;
 import com.twine.tango.pmr.integration.ExternalClientLoginResponseOuterClass.ExternalClientLoginResponse;
-import com.twine.tango.transport.ITransportAdapter;
 import com.twine.tango.transport.ResponseErrorException;
 import com.twine.tango.transport.adapters.TcpTransportAdapter;
 import com.twine.tango.transport.transporters.ProtoTransporter;
@@ -170,14 +167,13 @@ public class ExternalBridgeService extends ProtoTransporter implements IExternal
                 
                 if (newSocket != null)
                 {
-                    for (ITransportAdapter adapter : getAdapters())
+                    if (getAdapter() != null)
                     {
-                        adapter.disconnect().blockingAwait();
+                        getAdapter().disconnect().blockingAwait();
                     }
-                    getAdapters().clear();
                     TcpTransportAdapter adapter = new TcpTransportAdapter(newSocket);
                     adapter.setAuthenticated(false);
-                    getAdapters().add(adapter);
+                    setAdapter(adapter);
                     connect().blockingAwait();
                 }
                 
@@ -205,7 +201,7 @@ public class ExternalBridgeService extends ProtoTransporter implements IExternal
                 ExternalClientLoginRequest request = MessageFactory.parseMessageFromContainer(container);
                 if (request.getPassword().equals("Aa123456")) //TODO: Compare with global machine settings password...
                 {
-                    getAdapters().get(0).setAuthenticated(true);
+                    getAdapter().setAuthenticated(true);
                     sendResponse(MessageFactory.createTangoMessage(
                             ExternalClientLoginResponse.class,
                             ExternalClientLoginResponse.newBuilder().setAuthenticated(true).build(),
@@ -213,7 +209,7 @@ public class ExternalBridgeService extends ProtoTransporter implements IExternal
                 }
                 else
                 {
-                    getAdapters().get(0).setAuthenticated(false);
+                    getAdapter().setAuthenticated(false);
                     sendResponse(MessageFactory.createTangoMessage(
                             ExternalClientLoginResponse.class,
                             ExternalClientLoginResponse.newBuilder().setAuthenticated(false).build(),
@@ -223,7 +219,7 @@ public class ExternalBridgeService extends ProtoTransporter implements IExternal
                 return;
             }
             
-            if (getAdapters().get(0).isAuthenticated())
+            if (getAdapter().isAuthenticated())
             {
                 GeneratedMessageV3 message = MessageFactory.parseMessageFromContainerAgnostic(container);