If a client is specified in the spoken query, scan for clients before proceeding, in case the client specified was not running when clients were scanned for in the GUI.

Author: Chris Bellew

Voice Control For Plex/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.atomjack.vcfp"
-    android:versionCode="17"
-    android:versionName="1.8.2" >
+    android:versionCode="18"
+    android:versionName="1.8.3" >
 
     <uses-permission android:name="com.mohammadag.googlesearchapi.permission.ACCESS_GGOGLE_SEARCH_API" />
     <uses-permission android:name="android.permission.INTERNET" />

Voice Control For Plex/src/main/java/com/atomjack/vcfp/PlexSearchService.java

@@ -59,6 +59,8 @@ public class PlexSearchService extends Service {
 	private List<PlexTrack> tracks = new ArrayList<PlexTrack>();
 	private List<PlexDirectory> albums = new ArrayList<PlexDirectory>();
 
+	private boolean didClientScan = false;
+
 	private ArrayList<String> queries;
 	// Will be set to true after we scan for servers, so we don't have to do it again on the next query
 	private boolean didServerScan = false;
@@ -90,13 +92,25 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 		}
 
 		if(intent.getAction() != null && intent.getAction().equals(VoiceControlForPlexApplication.Intent.GDMRECEIVE)) {
-			// We just scanned for servers and are returning from that, so set the servers we found
-			// and then figure out which client to play to
-			Logger.d("Got back from scanning for servers.");
-			videoPlayed = false;
-			plexmediaServers = VoiceControlForPlexApplication.servers;
-			didServerScan = true;
-			setClient();
+			if(intent.getStringExtra(VoiceControlForPlexApplication.Intent.SCAN_TYPE).equals("server")) {
+				// We just scanned for servers and are returning from that, so set the servers we found
+				// and then figure out which client to play to
+				Logger.d("Got back from scanning for servers.");
+				videoPlayed = false;
+				plexmediaServers = VoiceControlForPlexApplication.servers;
+				didServerScan = true;
+				setClient();
+			} else if(intent.getStringExtra(VoiceControlForPlexApplication.Intent.SCAN_TYPE).equals("client")) {
+				// Got back from client scan, so set didClientScan to true so we don't do this again, and save the clients we got, then continue
+				didClientScan = true;
+				ArrayList<PlexClient> cs = intent.getParcelableArrayListExtra(VoiceControlForPlexApplication.Intent.EXTRA_CLIENTS);
+				VoiceControlForPlexApplication.clients = new HashMap<String, PlexClient>();
+				for(PlexClient c : cs) {
+					VoiceControlForPlexApplication.clients.put(c.name, c);
+				}
+				clients = (HashMap)VoiceControlForPlexApplication.clients;
+				startup();
+			}
 		} else {
 			queryText = null;
 			client = null;
@@ -183,6 +197,23 @@ public IBinder onBind(Intent intent) {
 	private void startup() {
 		queryText = queries.remove(0);
 
+		if(!didClientScan) {
+			if(queryText.matches(getString(R.string.pattern_on_client))) {
+				// A client was specified in the query, so let's scan for clients before proceeding.
+				// First, insert the query text back into the queries array, so we can use it after the scan is done.
+				queries.add(0, queryText);
+				Intent mServiceIntent = new Intent(this, GDMService.class);
+				mServiceIntent.putExtra("port", 32412); // Port for clients
+				mServiceIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+				mServiceIntent.putExtra("ORIGIN", PlexSearchService.class.getSimpleName());
+				mServiceIntent.putExtra("class", PlexSearchService.class);
+				mServiceIntent.putExtra(VoiceControlForPlexApplication.Intent.SCAN_TYPE, "client");
+				startService(mServiceIntent);
+				return;
+			}
+		}
+
+
 		Logger.d("Starting up with query string: %s", queryText);
 		tracks = new ArrayList<PlexTrack>();
 		videos = new ArrayList<PlexVideo>();

Voice Control For Plex/src/main/java/com/atomjack/vcfp/activities/MainActivity.java

@@ -348,6 +348,7 @@ public void onFailure(int statusCode) {
 						feedback.e(getResources().getString(R.string.no_wifi_connection_message));
 						return;
 					}
+					VoiceControlForPlexApplication.clients = new HashMap<String, PlexClient>();
 					localScan.searchForPlexClients();
 				} else if (holder.tag.equals(holder.TAG_FEEDBACK)) {
 					selectFeedback();
@@ -717,9 +718,9 @@ public void showUsageExamples(View v) {
 		usageDialog.setTitle(R.string.help_usage_button);
 		usageDialog.setMessage(R.string.help_usage);
 		usageDialog.setPositiveButton(R.string.got_it, new DialogInterface.OnClickListener() {
-					public void onClick(DialogInterface dialog, int id) {
-						dialog.dismiss();
-					}
+			public void onClick(DialogInterface dialog, int id) {
+				dialog.dismiss();
+			}
 		});
 		usageDialog.show();
 	}

Voice Control For Plex/src/main/res/xml/changelog.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="1.8.3" versioncode="18">
+        <change>Fixed a bug that sometimes prevented playback when a client is specified in the spoken query.</change>
+    </release>
     <release version="1.8.2" versioncode="17">
         <change>Added Pin login.</change>
         <change>Subscribe to player and exit from Now Playing screen if the player stops.</change>