Remove deprecated code from router service

3 files changed, 11 insertions, 92 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java
index f2164e498..faa4ad318 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java
@@ -4,6 +4,8 @@ import android.os.Looper;
 import android.os.Messenger;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import com.smartdevicelink.transport.enums.TransportType;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -30,10 +32,10 @@ public class RegisteredAppTests {
 
         // Instantiate SdlRouterService and Registered App class
         SdlRouterService router = new SdlRouterService();
-        SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, messenger);
+        SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, 1, messenger);
 
         // Call Handle Message
-        app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START,bytes);
+        app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START,bytes, TransportType.BLUETOOTH);
 
         // Insure that the buffer is not null, if it is the test will fail
         assertNotNull(app.buffer);
@@ -50,13 +52,13 @@ public class RegisteredAppTests {
 
         // Instantiate SdlRouterService and Registered App class
         SdlRouterService router = new SdlRouterService();
-        SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, messenger);
+        SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, 1, messenger);
 
         // Force Null Buffer
         app.buffer = null;
 
         // Call Handle Message - Making sure it doesn't init buffer
-        app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_NONE,bytes);
+        app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_NONE, bytes, TransportType.BLUETOOTH);
 
         // Insure that the buffer is null. and no NPE
         assertNull(app.buffer);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java
index 5815911e7..cf8b6a38d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java
@@ -187,8 +187,8 @@ public class SdlRouterServiceTests {
 
 			// We need a registered app for this to work
 			Message message = Message.obtain();
-			SdlRouterService.RegisteredApp app1 = sdlRouterService.new RegisteredApp("12345",message.replyTo);
-			SdlRouterService.RegisteredApp app2 = sdlRouterService.new RegisteredApp("12344",message.replyTo);
+			SdlRouterService.RegisteredApp app1 = sdlRouterService.new RegisteredApp("12345", 1, message.replyTo);
+			SdlRouterService.RegisteredApp app2 = sdlRouterService.new RegisteredApp("12344", 1, message.replyTo);
 			HashMap<String,SdlRouterService.RegisteredApp> registeredApps = new HashMap<>();
 			registeredApps.put(app1.getAppId(),app1);
 			registeredApps.put(app2.getAppId(),app2);
@@ -280,8 +280,8 @@ public class SdlRouterServiceTests {
 
 			// We need a registered app for this to work
 			Message message = Message.obtain();
-			SdlRouterService.RegisteredApp app1 = sdlRouterService.new RegisteredApp("12345",message.replyTo);
-			SdlRouterService.RegisteredApp app2 = sdlRouterService.new RegisteredApp("12344",message.replyTo);
+			SdlRouterService.RegisteredApp app1 = sdlRouterService.new RegisteredApp("12345", 1, message.replyTo);
+			SdlRouterService.RegisteredApp app2 = sdlRouterService.new RegisteredApp("12344", 1, message.replyTo);
 			HashMap<String,SdlRouterService.RegisteredApp> registeredApps = new HashMap<>();
 			registeredApps.put(app1.getAppId(),app1);
 			registeredApps.put(app2.getAppId(),app2);
@@ -688,7 +688,7 @@ public class SdlRouterServiceTests {
 	private void addDummyRegisteredApp(SdlRouterService routerService, String appId, int sessionId)
 			throws IllegalAccessException, NoSuchFieldException {
 		Message message = Message.obtain();
-		SdlRouterService.RegisteredApp app = routerService.new RegisteredApp(appId, message.replyTo);
+		SdlRouterService.RegisteredApp app = routerService.new RegisteredApp(appId, 1, message.replyTo);
 
 		Field raf = routerService.getClass().getDeclaredField("registeredApps");
 		raf.setAccessible(true);
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
index 2fde0e817..84a766978 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
@@ -152,11 +152,6 @@ public class SdlRouterService extends Service{
 
 	public static final String SDL_NOTIFICATION_FAQS_PAGE = "https://smartdevicelink.com/en/guides/android/frequently-asked-questions/sdl-notifications/";
 
-	/**
-	 * @deprecated use {@link TransportConstants#START_ROUTER_SERVICE_ACTION} instead
-	 */
-	@Deprecated
-	public static final String START_SERVICE_ACTION							= "sdl.router.startservice";
 	public static final String REGISTER_WITH_ROUTER_ACTION 					= "com.sdl.android.register";
 	
 	/** Message types sent from the BluetoothReadService Handler */
@@ -1610,12 +1605,6 @@ public class SdlRouterService extends Service{
 	***********************************************  Helper Methods **************************************************************
 	****************************************************************************************************************************************/
 
-	@SuppressWarnings("SameReturnValue")
-	@Deprecated
-	public  String getConnectedDeviceName(){
-		return null;
-	}
-
 	private ArrayList<TransportRecord> getConnectedTransports(){
 		ArrayList<TransportRecord> connected = new ArrayList<>();
         if(bluetoothTransport != null && bluetoothTransport.isConnected()){
@@ -1733,11 +1722,6 @@ public class SdlRouterService extends Service{
 		}
 	}
 
-	@Deprecated
-	public void onTransportConnected(final TransportType type){
-		onTransportConnected(new TransportRecord(type,null));
-	}
-
 	public void onTransportConnected(final TransportRecord record){
 		cancelForegroundTimeOut();
 		enterForeground(createConnectedNotificationText(),0,true);
@@ -1798,11 +1782,6 @@ public class SdlRouterService extends Service{
 		
 	}
 
-	@Deprecated
-	public void onTransportDisconnected(TransportType type) {
-		onTransportDisconnected(new TransportRecord(type,null));
-	}
-
 	public void onTransportDisconnected(TransportRecord record){
 		cachedModuleVersion = -1; //Reset our cached version
 		//Stop any current pings being sent before the proper state can be determined.
@@ -1911,16 +1890,6 @@ public class SdlRouterService extends Service{
 		}
 	}
 
-	@Deprecated
-	public void onTransportError(TransportType transportType){
-		onTransportError(new TransportRecord(transportType,null), null);
-	}
-
-	@Deprecated
-	public void onTransportError(TransportRecord record) {
-		onTransportError(record, null);
-	}
-
 	public void onTransportError(TransportRecord transport, Bundle errorBundle){
         switch (transport.getType()){
             case BLUETOOTH:
@@ -2429,29 +2398,6 @@ public class SdlRouterService extends Service{
 		//**************************************************************************************************************************************
 		//********************************************************* PREFERENCES ****************************************************************
 		//**************************************************************************************************************************************
-		/**
-		 * @deprecated
-		 * This method will set the last known bluetooth connection method that worked with this phone.
-		 * This helps speed up the process of connecting
-		 * @param level The level of bluetooth connecting method that last worked
-		 * @param prefLocation Where the preference should be stored
-		 */
-		@SuppressWarnings("DeprecatedIsStillUsed")
-		@Deprecated
-		public static void setBluetoothPrefs (int level, String prefLocation) {
-			DebugTool.logWarning(TAG, "This method is deprecated and will not take any action");
-		}
-
-		/**
-		* @deprecated
-	 	* This method has been deprecated as it was bad practice.
-	 	*/
-		@SuppressWarnings({"DeprecatedIsStillUsed", "SameReturnValue"})
-		@Deprecated
-		public static int getBluetoothPrefs(String prefLocation)
-		{		
-			return 0;
-		}
 
 	/**
 	 * Set the connection establishment status of the particular device
@@ -3075,24 +3021,6 @@ public class SdlRouterService extends Service{
 		/**
 		 * This is a simple class to hold onto a reference of a registered app.
 		 * @param appId the supplied id for this app that is attempting to register
-		 * @param messenger the specific messenger that is tied to this app
-		 */
-		@Deprecated
-		public RegisteredApp(String appId, Messenger messenger){			
-			this.appId = appId;
-			this.messenger = messenger;
-			this.sessionIds = new Vector<Long>();
-			this.queues = new ConcurrentHashMap<>();
-			queueWaitHandler = new Handler();
-			registeredTransports = new SparseArray<ArrayList<TransportType>>();
-			awaitingSession = new Vector<>();
-			setDeathNote();
-			routerMessagingVersion = 1;
-		}
-
-		/**
-		 * This is a simple class to hold onto a reference of a registered app.
-		 * @param appId the supplied id for this app that is attempting to register
 		 * @param routerMessagingVersion
 		 * @param messenger the specific messenger that is tied to this app
 		 */
@@ -3373,11 +3301,6 @@ public class SdlRouterService extends Service{
 			}
 		}
 
-		@Deprecated
-		public void handleMessage(int flags, byte[] packet) {
-			handleMessage(flags,packet,null);
-		}
-
 		public void handleMessage(int flags, byte[] packet, TransportType transportType){
 			if(flags == TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START){
 				clearBuffer();
@@ -3514,12 +3437,6 @@ public class SdlRouterService extends Service{
 		private final long timestamp;
 		final Bundle receivedBundle;
 		TransportType transportType;
-		
-		@SuppressWarnings("SameParameterValue")
-		@Deprecated
-		public PacketWriteTask(byte[] bytes, int offset, int size, int priorityCoefficient) {
-			this(bytes, offset, size, priorityCoefficient,null);
-		}
 
 		public PacketWriteTask(byte[] bytes, int offset, int size, int priorityCoefficient, TransportType transportType){
 			timestamp = System.currentTimeMillis();