Skip to content

Commit 8801e66

Browse files
bilal-alsharifibilal-alsharifi
committed
Merge branch 'develop' into feature/optimize_imports
2 parents 6dfaf8a + e532c9d commit 8801e66

6 files changed

Lines changed: 37 additions & 172 deletions

File tree

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
import androidx.test.ext.junit.runners.AndroidJUnit4;
77

8+
import com.smartdevicelink.transport.enums.TransportType;
9+
810
import org.junit.Test;
911
import org.junit.runner.RunWith;
1012

@@ -31,10 +33,10 @@ public void testHandleMessage() {
3133

3234
// Instantiate SdlRouterService and Registered App class
3335
SdlRouterService router = new SdlRouterService();
34-
SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, messenger);
36+
SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, 1, messenger);
3537

3638
// Call Handle Message
37-
app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START,bytes);
39+
app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START,bytes, TransportType.BLUETOOTH);
3840

3941
// Insure that the buffer is not null, if it is the test will fail
4042
assertNotNull(app.buffer);
@@ -51,13 +53,13 @@ public void testNullBuffer() {
5153

5254
// Instantiate SdlRouterService and Registered App class
5355
SdlRouterService router = new SdlRouterService();
54-
SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, messenger);
56+
SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, 1, messenger);
5557

5658
// Force Null Buffer
5759
app.buffer = null;
5860

5961
// Call Handle Message - Making sure it doesn't init buffer
60-
app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_NONE,bytes);
62+
app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_NONE, bytes, TransportType.BLUETOOTH);
6163

6264
// Insure that the buffer is null. and no NPE
6365
assertNull(app.buffer);

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ public void testRegisterAppExistingSessionIDDifferentApp() {
188188

189189
// We need a registered app for this to work
190190
Message message = Message.obtain();
191-
SdlRouterService.RegisteredApp app1 = sdlRouterService.new RegisteredApp("12345",message.replyTo);
192-
SdlRouterService.RegisteredApp app2 = sdlRouterService.new RegisteredApp("12344",message.replyTo);
191+
SdlRouterService.RegisteredApp app1 = sdlRouterService.new RegisteredApp("12345", 1, message.replyTo);
192+
SdlRouterService.RegisteredApp app2 = sdlRouterService.new RegisteredApp("12344", 1, message.replyTo);
193193
HashMap<String,SdlRouterService.RegisteredApp> registeredApps = new HashMap<>();
194194
registeredApps.put(app1.getAppId(),app1);
195195
registeredApps.put(app2.getAppId(),app2);
@@ -281,8 +281,8 @@ public void testRegisterAppExistingSessionIDSameApp() {
281281

282282
// We need a registered app for this to work
283283
Message message = Message.obtain();
284-
SdlRouterService.RegisteredApp app1 = sdlRouterService.new RegisteredApp("12345",message.replyTo);
285-
SdlRouterService.RegisteredApp app2 = sdlRouterService.new RegisteredApp("12344",message.replyTo);
284+
SdlRouterService.RegisteredApp app1 = sdlRouterService.new RegisteredApp("12345", 1, message.replyTo);
285+
SdlRouterService.RegisteredApp app2 = sdlRouterService.new RegisteredApp("12344", 1, message.replyTo);
286286
HashMap<String,SdlRouterService.RegisteredApp> registeredApps = new HashMap<>();
287287
registeredApps.put(app1.getAppId(),app1);
288288
registeredApps.put(app2.getAppId(),app2);
@@ -689,7 +689,7 @@ private void initFields(SdlRouterService routerService) throws IllegalAccessExce
689689
private void addDummyRegisteredApp(SdlRouterService routerService, String appId, int sessionId)
690690
throws IllegalAccessException, NoSuchFieldException {
691691
Message message = Message.obtain();
692-
SdlRouterService.RegisteredApp app = routerService.new RegisteredApp(appId, message.replyTo);
692+
SdlRouterService.RegisteredApp app = routerService.new RegisteredApp(appId, 1, message.replyTo);
693693

694694
Field raf = routerService.getClass().getDeclaredField("registeredApps");
695695
raf.setAccessible(true);

‎android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java‎

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,6 @@ public class SdlRouterService extends Service{
153153

154154
public static final String SDL_NOTIFICATION_FAQS_PAGE = "https://smartdevicelink.com/en/guides/android/frequently-asked-questions/sdl-notifications/";
155155

156-
/**
157-
* @deprecated use {@link TransportConstants#START_ROUTER_SERVICE_ACTION} instead
158-
*/
159-
@Deprecated
160-
public static final String START_SERVICE_ACTION = "sdl.router.startservice";
161156
public static final String REGISTER_WITH_ROUTER_ACTION = "com.sdl.android.register";
162157

163158
/** Message types sent from the BluetoothReadService Handler */
@@ -1611,12 +1606,6 @@ private String createConnectedNotificationText(){
16111606
*********************************************** Helper Methods **************************************************************
16121607
****************************************************************************************************************************************/
16131608

1614-
@SuppressWarnings("SameReturnValue")
1615-
@Deprecated
1616-
public String getConnectedDeviceName(){
1617-
return null;
1618-
}
1619-
16201609
private ArrayList<TransportRecord> getConnectedTransports(){
16211610
ArrayList<TransportRecord> connected = new ArrayList<>();
16221611
if(bluetoothTransport != null && bluetoothTransport.isConnected()){
@@ -1734,11 +1723,6 @@ private synchronized void initBluetoothSerialService(){
17341723
}
17351724
}
17361725

1737-
@Deprecated
1738-
public void onTransportConnected(final TransportType type){
1739-
onTransportConnected(new TransportRecord(type,null));
1740-
}
1741-
17421726
public void onTransportConnected(final TransportRecord record){
17431727
cancelForegroundTimeOut();
17441728
enterForeground(createConnectedNotificationText(),0,true);
@@ -1799,11 +1783,6 @@ private Message createHardwareConnectedMessage(final TransportRecord record){
17991783

18001784
}
18011785

1802-
@Deprecated
1803-
public void onTransportDisconnected(TransportType type) {
1804-
onTransportDisconnected(new TransportRecord(type,null));
1805-
}
1806-
18071786
public void onTransportDisconnected(TransportRecord record){
18081787
cachedModuleVersion = -1; //Reset our cached version
18091788
//Stop any current pings being sent before the proper state can be determined.
@@ -1912,16 +1891,6 @@ public void onTransportDisconnected(TransportRecord record){
19121891
}
19131892
}
19141893

1915-
@Deprecated
1916-
public void onTransportError(TransportType transportType){
1917-
onTransportError(new TransportRecord(transportType,null), null);
1918-
}
1919-
1920-
@Deprecated
1921-
public void onTransportError(TransportRecord record) {
1922-
onTransportError(record, null);
1923-
}
1924-
19251894
public void onTransportError(TransportRecord transport, Bundle errorBundle){
19261895
switch (transport.getType()){
19271896
case BLUETOOTH:
@@ -2430,29 +2399,6 @@ private synchronized boolean bluetoothConnect(BluetoothDevice device){
24302399
//**************************************************************************************************************************************
24312400
//********************************************************* PREFERENCES ****************************************************************
24322401
//**************************************************************************************************************************************
2433-
/**
2434-
* @deprecated
2435-
* This method will set the last known bluetooth connection method that worked with this phone.
2436-
* This helps speed up the process of connecting
2437-
* @param level The level of bluetooth connecting method that last worked
2438-
* @param prefLocation Where the preference should be stored
2439-
*/
2440-
@SuppressWarnings("DeprecatedIsStillUsed")
2441-
@Deprecated
2442-
public static void setBluetoothPrefs (int level, String prefLocation) {
2443-
DebugTool.logWarning(TAG, "This method is deprecated and will not take any action");
2444-
}
2445-
2446-
/**
2447-
* @deprecated
2448-
* This method has been deprecated as it was bad practice.
2449-
*/
2450-
@SuppressWarnings({"DeprecatedIsStillUsed", "SameReturnValue"})
2451-
@Deprecated
2452-
public static int getBluetoothPrefs(String prefLocation)
2453-
{
2454-
return 0;
2455-
}
24562402

24572403
/**
24582404
* Set the connection establishment status of the particular device
@@ -3073,24 +3019,6 @@ class RegisteredApp {
30733019
//Primary will always be first
30743020
final SparseArray<ArrayList<TransportType>> registeredTransports;
30753021

3076-
/**
3077-
* This is a simple class to hold onto a reference of a registered app.
3078-
* @param appId the supplied id for this app that is attempting to register
3079-
* @param messenger the specific messenger that is tied to this app
3080-
*/
3081-
@Deprecated
3082-
public RegisteredApp(String appId, Messenger messenger){
3083-
this.appId = appId;
3084-
this.messenger = messenger;
3085-
this.sessionIds = new Vector<Long>();
3086-
this.queues = new ConcurrentHashMap<>();
3087-
queueWaitHandler = new Handler();
3088-
registeredTransports = new SparseArray<ArrayList<TransportType>>();
3089-
awaitingSession = new Vector<>();
3090-
setDeathNote();
3091-
routerMessagingVersion = 1;
3092-
}
3093-
30943022
/**
30953023
* This is a simple class to hold onto a reference of a registered app.
30963024
* @param appId the supplied id for this app that is attempting to register
@@ -3374,11 +3302,6 @@ public int sendMessage(Message message){
33743302
}
33753303
}
33763304

3377-
@Deprecated
3378-
public void handleMessage(int flags, byte[] packet) {
3379-
handleMessage(flags,packet,null);
3380-
}
3381-
33823305
public void handleMessage(int flags, byte[] packet, TransportType transportType){
33833306
if(flags == TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START){
33843307
clearBuffer();
@@ -3515,12 +3438,6 @@ public class PacketWriteTask implements Runnable{
35153438
private final long timestamp;
35163439
final Bundle receivedBundle;
35173440
TransportType transportType;
3518-
3519-
@SuppressWarnings("SameParameterValue")
3520-
@Deprecated
3521-
public PacketWriteTask(byte[] bytes, int offset, int size, int priorityCoefficient) {
3522-
this(bytes, offset, size, priorityCoefficient,null);
3523-
}
35243441

35253442
public PacketWriteTask(byte[] bytes, int offset, int size, int priorityCoefficient, TransportType transportType){
35263443
timestamp = System.currentTimeMillis();

0 commit comments

Comments
 (0)