Merge pull request #1472 from smartdevicelink/feature/remove_old_transport_classes

Remove old transport classes

Author: Robert Henigan

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java

@@ -5,8 +5,6 @@
 import com.smartdevicelink.proxy.RPCRequest;
 import com.smartdevicelink.streaming.IStreamListener;
 import com.smartdevicelink.test.TestValues;
-import com.smartdevicelink.transport.BTTransportConfig;
-import com.smartdevicelink.transport.BaseTransportConfig;
 import com.smartdevicelink.transport.MultiplexTransportConfig;
 import com.smartdevicelink.util.Version;
 

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java

@@ -7,8 +7,6 @@
 import com.smartdevicelink.streaming.IStreamListener;
 import com.smartdevicelink.streaming.StreamPacketizer;
 import com.smartdevicelink.test.TestValues;
-import com.smartdevicelink.transport.BTTransportConfig;
-import com.smartdevicelink.transport.BaseTransportConfig;
 import com.smartdevicelink.transport.MultiplexTransportConfig;
 
 import junit.framework.TestCase;

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BTTransportConfigTests.java

@@ -6,7 +6,6 @@
 import android.os.Message;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.smartdevicelink.protocol.SdlPacket;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -15,40 +14,19 @@
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
-import static junit.framework.TestCase.assertTrue;
 
 @RunWith(AndroidJUnit4.class)
 public class MultiplexTransportTest {
 
 	RouterServiceValidator rsvp;
-	ITransportListener transportListener;
 
 
 	@Before
 	public void setUp() throws Exception {
 		rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext());
 		rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_NONE);
 		rsvp.validate();
-		
-		transportListener = new ITransportListener(){
-
-			@Override
-			public void onTransportPacketReceived(SdlPacket packet) {
-			}
-
-			@Override
-			public void onTransportConnected() {
-			}
-
-			@Override
-			public void onTransportDisconnected(String info) {
-			}
 
-			@Override
-			public void onTransportError(String info, Exception e) {
-			}
-			
-		};
 
 	}
 	// test for setting error state.

android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java

@@ -48,7 +48,6 @@
 import com.smartdevicelink.transport.BaseTransportConfig;
 import com.smartdevicelink.transport.MultiplexTransportConfig;
 import com.smartdevicelink.transport.TCPTransportConfig;
-import com.smartdevicelink.transport.USBTransportConfig;
 import com.smartdevicelink.transport.enums.TransportType;
 import com.smartdevicelink.util.DebugTool;
 
@@ -76,22 +75,6 @@ public LifecycleManager(AppConfig appConfig, BaseTransportConfig config, Lifecyc
     void initialize() {
         super.initialize();
 
-        //Handle legacy USB connections
-        if (_transportConfig != null && TransportType.USB.equals(_transportConfig.getTransportType())) {
-            //A USB transport config was provided
-            USBTransportConfig usbTransportConfig = (USBTransportConfig) _transportConfig;
-            if (usbTransportConfig.getUsbAccessory() == null) {
-                DebugTool.logInfo(TAG,"Legacy USB transport config was used, but received null for accessory. Attempting to connect with router service");
-                //The accessory was null which means it came from a router service
-                MultiplexTransportConfig multiplexTransportConfig = new MultiplexTransportConfig(usbTransportConfig.getUSBContext(), appConfig.getAppID());
-                multiplexTransportConfig.setRequiresHighBandwidth(true);
-                multiplexTransportConfig.setSecurityLevel(MultiplexTransportConfig.FLAG_MULTI_SECURITY_OFF);
-                multiplexTransportConfig.setPrimaryTransports(Collections.singletonList(TransportType.USB));
-                multiplexTransportConfig.setSecondaryTransports(new ArrayList<TransportType>());
-                _transportConfig = multiplexTransportConfig;
-            }
-        }
-
         if (_transportConfig != null && _transportConfig.getTransportType().equals(TransportType.MULTIPLEX)) {
             this.session = new SdlSession(sdlSessionListener, (MultiplexTransportConfig) _transportConfig);
         } else if (_transportConfig != null && _transportConfig.getTransportType().equals(TransportType.TCP)) {

android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java

@@ -113,14 +113,14 @@ public void onReceive(Context context, Intent intent) {
 		}
 
         if(!(action.equalsIgnoreCase(BluetoothDevice.ACTION_ACL_CONNECTED)
-        		|| action.equalsIgnoreCase(USBTransport.ACTION_USB_ACCESSORY_ATTACHED)
+        		|| action.equalsIgnoreCase(TransportConstants.ACTION_USB_ACCESSORY_ATTACHED)
         		|| action.equalsIgnoreCase(TransportConstants.START_ROUTER_SERVICE_ACTION))){
         	//We don't want anything else here if the child class called super and has different intent filters
         	//Log.i(TAG, "Unwanted intent from child class");
         	return;
         }
 
-        if(action.equalsIgnoreCase(USBTransport.ACTION_USB_ACCESSORY_ATTACHED)){
+        if(action.equalsIgnoreCase(TransportConstants.ACTION_USB_ACCESSORY_ATTACHED)){
 			DebugTool.logInfo(TAG,"Usb connected");
         	intent.setAction(null);
 			onSdlEnabled(context, intent);