Merge pull request #330 from smartdevicelink/feature/multiplexing_cleanup

Multiplexing cleanup

Author: joeygrover

sdl_android_lib/src/com/smartdevicelink/SdlConnection/SdlConnection.java

@@ -102,15 +102,13 @@ private void constructor(BaseTransportConfig transportConfig,RouterServiceValida
 						cachedMultiConfig.setService(null);
 					}
 					enableLegacyMode(true,TransportType.BLUETOOTH); //We will use legacy bluetooth connection for this attempt
-					Log.d(TAG, "Legacy transport : " + legacyTransportRequest);
 				}
 			}
 
 			if(!isLegacyModeEnabled() && //Make sure legacy mode is not enabled
 					(transportConfig.getTransportType() == TransportType.MULTIPLEX)){
 				_transport = new MultiplexTransport((MultiplexTransportConfig)transportConfig,this);
 			}else if(isLegacyModeEnabled() && legacyTransportRequest == TransportType.BLUETOOTH){
-				Log.d(TAG, "Creating legacy bluetooth connection");
 				_transport = new BTTransport(this, true); 
 			}else if(transportConfig.getTransportType() == TransportType.BLUETOOTH){
 				_transport = new BTTransport(this,((BTTransportConfig)transportConfig).getKeepSocketActive());
@@ -529,22 +527,20 @@ public void forceHardwareConnectEvent(TransportType type){
 			MultiplexTransport multi = ((MultiplexTransport)_transport);
 			MultiplexTransportConfig config = multi.getConfig();
 			ComponentName tempCompName = SdlBroadcastReceiver.consumeQueuedRouterService();
-			//Log.d(TAG, "Consumed component name: " +tempCompName );
 			if(config.getService().equals(tempCompName)){ //If this is the same service that just connected that we are already looking at. Attempt to reconnect
 				if(!multi.getIsConnected() && multi.isDisconnecting() ){ //If we aren't able to force a connection it means the 
-					//Log.d(TAG, "Recreating our multiplexing transport");
 					_transport = new MultiplexTransport(config,this);
 					try {
 						startTransport();
 					} catch (SdlException e) {
 						e.printStackTrace();
 					}
-				}//else{Log.w(TAG, "Guess we're just calling it a day");}
+				}
 			}else if(tempCompName!=null){
 				//We have a conflicting service request
 				Log.w(TAG, "Conflicting services. Disconnecting from current and connecting to new");
-				Log.w(TAG, "Old service " + config.getService().toShortString());
-				Log.w(TAG, "New Serivce " + tempCompName.toString());
+				//Log.w(TAG, "Old service " + config.getService().toShortString());
+				//Log.w(TAG, "New Serivce " + tempCompName.toString());
 				multi.disconnect();
 				config.setService(tempCompName);
 				_transport = new MultiplexTransport(config,this);

sdl_android_lib/src/com/smartdevicelink/transport/MultiplexBluetoothTransport.java

@@ -49,7 +49,7 @@ public class MultiplexBluetoothTransport {
 	private static final String TAG = "Bluetooth Transport";
     private static final UUID SERVER_UUID= new UUID(0x936DA01F9ABD4D9DL, 0x80C702AF85C822A8L);
     // Name for the SDP record when creating server socket
-    private static final String NAME_SECURE =" SdlProxy";// = "LIVIO_CONNECT";
+    private static final String NAME_SECURE =" SdlRouterService";
 
 
 	protected static final String SHARED_PREFS = "sdl.bluetoothprefs";
@@ -696,7 +696,7 @@ public ConnectedWriteThread(BluetoothSocket socket) {
         	//Log.d(TAG, "Creating a Connected - Write Thread");
             mmSocket = socket;
             OutputStream tmpOut = null;
-            setName(" Livio Bluetooth Write Thread");
+            setName("SDL Router BT Write Thread");
             // Get the BluetoothSocket input and output streams
             try {
                 tmpOut = socket.getOutputStream();
@@ -731,7 +731,6 @@ public void write(byte[] buffer, int offset, int count) {
 
         public synchronized void cancel() {
             try {
-            	Log.d(TAG, "Calling Cancel in the write thread");
             	if(mmOutStream!=null){
             		mmOutStream.flush();
             		mmOutStream.close();
@@ -756,7 +755,7 @@ public ConnectedThread(BluetoothSocket socket) {
         	//Log.d(TAG, "Creating a Connected - Read Thread");
             mmSocket = socket;
             InputStream tmpIn = null;
-            setName(" Livio Bluetooth Read Thread");
+            setName("SDL Router BT Read Thread");
             // Get the BluetoothSocket input and output streams
             try {
                 tmpIn = socket.getInputStream();

sdl_android_lib/src/com/smartdevicelink/transport/MultiplexTransport.java

@@ -15,7 +15,7 @@
 
 public class MultiplexTransport extends SdlTransport{
 	private final static String TAG = "Multiplex Transport";
-	private String sComment = "I'm_a_little_teapot";
+	private String sComment = "Multiplexing";
 
 	TransportBrokerThread brokerThread;
 	protected boolean isDisconnecting = false;
@@ -213,7 +213,7 @@ public void removeSession(long sessionId){
 		public void run() {
 			Looper.prepare();
 
-			if(broker==null){Log.d("JOEY", "Starting broker");
+			if(broker==null){
 				synchronized(this){
 					initTransportBroker();
 					if(queueStart){
@@ -228,7 +228,6 @@ public void run() {
 			}
 			threadLooper = Looper.myLooper();
 			Looper.loop();
-			Log.i(TAG, "Looper has finished. Thread should be sutting down");
 
 		}
 
@@ -242,9 +241,8 @@ public boolean onHardwareConnected(TransportType type) {
 						Log.d(TAG, "On transport connected...");
 						if(!connected){
 							connected = true;
-							Log.d(TAG, "Handling transport connected");
 							handleTransportConnected();
-						}else{Log.d(TAG, "Already connected");}
+						}//else{Log.d(TAG, "Already connected");}
 						return true;
 					}else{
 						try{

sdl_android_lib/src/com/smartdevicelink/transport/RouterServiceValidator.java

@@ -35,7 +35,7 @@
  *
  */
 public class RouterServiceValidator {
-	private static final String TAG = "PackageCheckUtl";
+	private static final String TAG = "RSVP";
 	public static final String ROUTER_SERVICE_PACKAGE = "com.sdl.router";
 
 	private static final String REQUEST_PREFIX = "https://woprjr.smartdevicelink.com/api/1/applications/queryTrustedRouters"; 
@@ -116,7 +116,7 @@ public boolean validate(){
 			}
 		}
 
-		Log.d(TAG, "Checking app package: " + service.getClassName());
+		//Log.d(TAG, "Checking app package: " + service.getClassName());
 		packageName = this.appPackageForComponentName(service, pm);
 
 
@@ -328,10 +328,9 @@ private static List<SdlApp> findAllSdlApps(Context context){
 		intent.setAction("sdl.router.startservice");
 		List<ResolveInfo> infoList = packageManager.queryBroadcastReceivers(intent, 0);
 		if(infoList!=null){
-			Log.i(TAG, "Number of SDL apps: " + infoList.size());
 			String packageName;
 			for(ResolveInfo info : infoList){
-				Log.i(TAG, "SDL apps: " + info.activityInfo.packageName);
+				//Log.i(TAG, "SDL apps: " + info.activityInfo.packageName);
 				packageName = info.activityInfo.packageName;
 				try {
 					apps.add(new SdlApp(packageName,packageManager.getPackageInfo(packageName,0).versionCode));
@@ -362,7 +361,6 @@ protected static boolean createTrustedListRequest(final Context context, boolean
 		}
 
 		if(!forceRefresh && (System.currentTimeMillis()-getTrustedAppListTimeStamp(context))<REFRESH_TRUSTED_APP_LIST_TIME){ 
-			Log.d(TAG, "Don't need to get new list");
 			//Our list should still be ok for now so we will skip the request
 			pendingListRefresh = false;
 			return false;
@@ -393,15 +391,13 @@ protected static boolean createTrustedListRequest(final Context context, boolean
 
 		try {object.put(JSON_PUT_ARRAY_TAG, array);} catch (JSONException e) {e.printStackTrace();}
 
-		Log.d(TAG, "Request of apps: " + object.toString());
-
 		if (cb == null) {
 			cb = new HttpRequestTaskCallback() {
 
 				@Override
 				public void httpCallComplete(String response) {
 					// Might want to check if this list is ok
-					Log.d(TAG, "APPS! " + response);
+					//Log.d(TAG, "APPS! " + response);
 					setTrustedList(context, response);
 					pendingListRefresh = false;
 				}

sdl_android_lib/src/com/smartdevicelink/transport/SdlBroadcastReceiver.java

@@ -1,6 +1,8 @@
 package com.smartdevicelink.transport;
 
 import java.util.Locale;
+import java.util.Vector;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
@@ -9,8 +11,6 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.util.Log;
 
 public abstract class SdlBroadcastReceiver extends BroadcastReceiver{
@@ -29,7 +29,7 @@ public abstract class SdlBroadcastReceiver extends BroadcastReceiver{
 	public static final String TRANSPORT_GLOBAL_PREFS 						= "SdlTransportPrefs"; 
 	public static final String IS_TRANSPORT_CONNECTED						= "isTransportConnected"; 
 
-	public static ComponentName runningBluetoothServicePackage = null;
+	public static Vector<ComponentName> runningBluetoothServicePackage = null;
 
     @SuppressWarnings("rawtypes")
 	private static Class localRouterClass;
@@ -72,15 +72,15 @@ public void onReceive(Context context, Intent intent) {
 					String packageName = intent.getStringExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_APP_PACKAGE);
 					ComponentName componentName = intent.getParcelableExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_CMP_NAME);
 					if(componentName!=null){
-						Log.v(TAG, "SDL enabled by router service from " + packageName + " compnent package " + componentName.getPackageName()  + " - " + componentName.getClassName());
+						//Log.v(TAG, "SDL enabled by router service from " + packageName + " compnent package " + componentName.getPackageName()  + " - " + componentName.getClassName());
 						RouterServiceValidator vlad = new RouterServiceValidator(context,componentName);
 						if(vlad.validate()){
-							Log.d(TAG, "Router service trusted!");
+							//Log.d(TAG, "Router service trusted!");
 							queuedService = componentName;
 							intent.setAction("com.sdl.noaction"); //Replace what's there so we do go into some unintended loop
 							onSdlEnabled(context, intent);
 						}else{
-							Log.e(TAG, "RouterService was not trusted. Ignoring intent from : "+ componentName.getClassName());
+							Log.w(TAG, "RouterService was not trusted. Ignoring intent from : "+ componentName.getClassName());
 						}
 
 					}
@@ -93,7 +93,6 @@ public void onReceive(Context context, Intent intent) {
 				return;
 			}else if(intent.getBooleanExtra(TransportConstants.PING_ROUTER_SERVICE_EXTRA, false)){
 				//We were told to wake up our router services
-				Log.d(TAG, "Starting router service off ping");
 				boolean altServiceWake = intent.getBooleanExtra(TransportConstants.BIND_REQUEST_TYPE_ALT_TRANSPORT, false);
 				didStart = wakeUpRouterService(context, false,altServiceWake );
 
@@ -113,15 +112,13 @@ public void onReceive(Context context, Intent intent) {
 	    			return;
 	    		}else if(state == BluetoothAdapter.STATE_TURNING_ON){
 	    			//We started bluetooth, we should check for a new valid router list
-	    			Log.d(TAG, "Attempting to get list of approved router services");
 	    			RouterServiceValidator.createTrustedListRequest(context,true);
 	    		}
 	    }
 
 	    if(localRouterClass!=null){ //If there is a supplied router service lets run some logic regarding starting one
 
 	    	if(!didStart){
-	    		Log.d(TAG, "Waking up router service");
 	    		didStart = wakeUpRouterService(context, true,false);
 	    	}
 
@@ -138,10 +135,8 @@ public void onReceive(Context context, Intent intent) {
 	}
 
 	private boolean wakeUpRouterService(Context context, boolean ping, boolean altTransportWake){
-		Log.d(TAG, "Waking up router service");
     	if(!isRouterServiceRunning(context, ping)){  
     		//If there isn't a service running we should try to start one
-    		Log.i(TAG, "Attempting to start an instance of the Router Service");
     		//The under class should have implemented this....
 
     		//So let's start up our service since no copy is running
@@ -152,18 +147,21 @@ private boolean wakeUpRouterService(Context context, boolean ping, boolean altTr
     		context.startService(serviceIntent);
     		return true;
     	}else{
-    		Log.i(TAG, "An instance of the Router Service is already running");	
-    		if(altTransportWake){
+    		if(altTransportWake &&  runningBluetoothServicePackage!=null && runningBluetoothServicePackage.size()>0){
     			Intent serviceIntent = new Intent();
-    			serviceIntent.setComponent(runningBluetoothServicePackage);
         		serviceIntent.setAction(TransportConstants.BIND_REQUEST_TYPE_ALT_TRANSPORT);
-        		context.startService(serviceIntent);
+        		//context.startService(serviceIntent);
+        		for(ComponentName compName: runningBluetoothServicePackage){
+        			serviceIntent.setComponent(compName);
+        			context.startService(serviceIntent);
+
+        		}
         		return true;
     		}
     		return false;
     	}
 	}
-	
+
 	/**
 	 * Determines if an instance of the Router Service is currently running on the device. 
 	 * @param context A context to access Android system services through.
@@ -175,13 +173,18 @@ private static boolean isRouterServiceRunning(Context context, boolean pingServi
 			Log.e(TAG, "Can't look for router service, context supplied was null");
 			return false;
 		}
-		Log.d(TAG, "Looking for Service: "+ SDL_ROUTER_SERVICE_CLASS_NAME);
 		ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+		if(runningBluetoothServicePackage==null){
+			runningBluetoothServicePackage = new Vector<ComponentName>();
+		}else{
+			runningBluetoothServicePackage.clear();
+		}
 	    for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
 	    	//We will check to see if it contains this name, should be pretty specific
 	    	//Log.d(TAG, "Found Service: "+ service.service.getClassName());
 	    	if ((service.service.getClassName()).toLowerCase(Locale.US).contains(SDL_ROUTER_SERVICE_CLASS_NAME)) {
-	    		runningBluetoothServicePackage = service.service;	//Store which instance is running
+	    		
+	    		runningBluetoothServicePackage.add(service.service);	//Store which instance is running
 	            if(pingService){
 	            	Intent intent = new Intent();
 	            	intent.setClassName(service.service.getPackageName(), service.service.getClassName());
@@ -196,21 +199,64 @@ private static boolean isRouterServiceRunning(Context context, boolean pingServi
 
 	}
 
+	/**
+	 * This call will reach out to all SDL related router services to check if they're connected. If a the router service is connected, it will react by pinging all clients. This receiver will then
+	 * receive that ping and if the router service is trusted, the onSdlEnabled method will be called. 
+	 * @param context
+	 */
+	public static void queryForConnectedService(Context context){
+		//Leverage existing call. Include ping bit
+		requestTransportStatus(context,null,true);
+	}
 	/**
 	 * If a Router Service is running, this method determines if that service is connected to a device over some form of transport.
 	 * @param context A context to access Android system services through. If null is passed, this will always return false
 	 * @param callback Use this callback to find out if the router service is connected or not. 
 	 */
-	public static void requestTransportStatus(Context context, SdlRouterStatusProvider.ConnectedStatusCallback callback){
-		Log.d(TAG, "Checking to see if router service is transport connected");
+	public static void requestTransportStatus(Context context, final SdlRouterStatusProvider.ConnectedStatusCallback callback){
+		requestTransportStatus(context,callback,false);
+	}
+
+	private static void requestTransportStatus(Context context, final SdlRouterStatusProvider.ConnectedStatusCallback callback, final boolean triggerRouterServicePing){
 		if(context == null){
 			if(callback!=null){
-				callback.onConnectionStatusUpdate(false, context);
+				callback.onConnectionStatusUpdate(false, null,context);
 			}
+			return;
 		}
-		if(isRouterServiceRunning(context,false)){	//So there is a service up, let's see if it's connected
-			SdlRouterStatusProvider provider = new SdlRouterStatusProvider(context,runningBluetoothServicePackage,callback);
-			provider.checkIsConnected();
+		if(isRouterServiceRunning(context,false) && !runningBluetoothServicePackage.isEmpty()){	//So there is a service up, let's see if it's connected
+			final ConcurrentLinkedQueue<ComponentName> list = new ConcurrentLinkedQueue<ComponentName>(runningBluetoothServicePackage);
+			if(runningBluetoothServicePackage.size()>0){ //TODO for testing do this for all cases
+				final SdlRouterStatusProvider.ConnectedStatusCallback sdlBrCallback = new SdlRouterStatusProvider.ConnectedStatusCallback() {	
+					
+					@Override
+					public void onConnectionStatusUpdate(boolean connected, ComponentName service,Context context) {
+						if(!connected && !list.isEmpty()){
+							SdlRouterStatusProvider provider = new SdlRouterStatusProvider(context,list.poll(), this);
+							if(triggerRouterServicePing){provider.setFlags(TransportConstants.ROUTER_STATUS_FLAG_TRIGGER_PING);	}
+							provider.checkIsConnected();
+						}else{
+							Log.d(TAG, service.getPackageName() + " is connected = " + connected);
+							if(callback!=null){
+								callback.onConnectionStatusUpdate(connected, service,context);
+							}
+							list.clear();
+						}
+
+					}
+				};
+				SdlRouterStatusProvider provider = new SdlRouterStatusProvider(context,list.poll(),sdlBrCallback);
+				if(triggerRouterServicePing){
+					provider.setFlags(TransportConstants.ROUTER_STATUS_FLAG_TRIGGER_PING);
+				}
+				provider.checkIsConnected();
+			}else{ //If only one service is running, just check that
+				SdlRouterStatusProvider provider = new SdlRouterStatusProvider(context,runningBluetoothServicePackage.get(0),callback);
+				if(triggerRouterServicePing){
+					provider.setFlags(TransportConstants.ROUTER_STATUS_FLAG_TRIGGER_PING);
+				}
+				provider.checkIsConnected();
+			}
 		}else{
 			Log.w(TAG, "Router service isn't running, returning false.");
 			if(BluetoothAdapter.getDefaultAdapter()!=null && BluetoothAdapter.getDefaultAdapter().isEnabled()){
@@ -220,10 +266,11 @@ public static void requestTransportStatus(Context context, SdlRouterStatusProvid
 	    		context.sendBroadcast(serviceIntent);
 			}
 			if(callback!=null){
-				callback.onConnectionStatusUpdate(false, context);
+				callback.onConnectionStatusUpdate(false, null,context);
 			}
 		}
 	}
+	
 
 
 	public static ComponentName consumeQueuedRouterService(){