Upgraded local server and client scanning to support Rokus. A few other small bug fixes.

Author: Chris Bellew

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

@@ -31,7 +31,7 @@ protected void onHandleIntent(Intent intent) {
 				int port = intent.getIntExtra("port", 32414); // Default port, for Plex Media Servers (Clients use 32412)
 				DatagramSocket socket = new DatagramSocket(32420);
 				socket.setBroadcast(true);
-				String data = "M-SEARCH * HTTP/1.0";
+				String data = "M-SEARCH * HTTP/1.1";
 				DatagramPacket packet = new DatagramPacket(data.getBytes(), data.length(), getBroadcastAddress(), port);
 				socket.send(packet);
 				Logger.i("Search Packet Broadcasted");

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

@@ -121,6 +121,11 @@ public void searchForPlexClients() {
 		context.startService(mServiceIntent);
 	}
 
+	public void hideSearchDialog() {
+		if(searchDialog != null)
+			searchDialog.dismiss();
+	}
+
 	public void showPlexClients(Map<String, PlexClient> clients) {
 		showPlexClients(clients, false);
 	}

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

@@ -562,7 +562,7 @@ private void resumePlayback() {
 
 	private void stopPlayback() {
 		adjustPlayback("stop", getResources().getString(R.string.playback_stopped));
-		if(VoiceControlForPlexApplication.isNowPlayingVisible()) {
+		if(VoiceControlForPlexApplication.isApplicationVisible()) {
 			Intent stopIntent = new Intent(this, NowPlayingActivity.class);
 			stopIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
 			stopIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);

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

@@ -28,7 +28,7 @@ public class VoiceControlForPlexApplication extends Application
 {
 	public final static String MINIMUM_PHT_VERSION = "1.0.7";
 
-	private static boolean nowPlayingVisible;
+	private static boolean isApplicationVisible;
 
 	public final static class Intent {
 			public final static String GDMRECEIVE = "com.atomjack.vcfp.intent.gdmreceive";
@@ -82,20 +82,25 @@ public static void addPlexServer(final PlexServer server) {
 		}
 		if (!servers.containsKey(server.name)) {
 			try {
-				String url = String.format("http://%s:%s/library/sections/", server.address, server.port);
-				if(server.accessToken != null)
-					url += String.format("?%s=%s", PlexHeaders.XPlexToken, server.accessToken);
-				AsyncHttpClient httpClient = new AsyncHttpClient();
-				httpClient.get(url, new AsyncHttpResponseHandler() {
-						@Override
-						public void onSuccess(int statusCode, org.apache.http.Header[] headers, byte[] responseBody) {
+				server.findServerConnection(new ServerFindHandler() {
+					@Override
+					public void onSuccess() {
+						Logger.d("active connection: %s", server.activeConnection);
+						String url = String.format("http://%s:%s/library/sections/", server.activeConnection.address, server.activeConnection.port);
+						if(server.accessToken != null)
+							url += String.format("?%s=%s", PlexHeaders.XPlexToken, server.accessToken);
+						AsyncHttpClient httpClient = new AsyncHttpClient();
+						Logger.d("Fetching %s", url);
+						httpClient.get(url, new AsyncHttpResponseHandler() {
+							@Override
+							public void onSuccess(int statusCode, org.apache.http.Header[] headers, byte[] responseBody) {
 								MediaContainer mc = new MediaContainer();
 								try {
 									mc = serial.read(MediaContainer.class, new String(responseBody, "UTF-8"));
 								} catch (NotFoundException e) {
-										e.printStackTrace();
+									e.printStackTrace();
 								} catch (Exception e) {
-										e.printStackTrace();
+									e.printStackTrace();
 								}
 								for(int i=0;i<mc.directories.size();i++) {
 									if(mc.directories.get(i).type.equals("movie")) {
@@ -113,9 +118,17 @@ public void onSuccess(int statusCode, org.apache.http.Header[] headers, byte[] r
 									servers.put(server.name, server);
 									Logger.d("Added %s.", server.name);
 								}
-						}
+							}
+						});
+					}
+
+					@Override
+					public void onFailure(int statusCode) {
+						// TODO: Handle failure here
+					}
 				});
 
+
 			} catch (Exception e) {
 				Logger.e("Exception getting clients: %s", e.toString());
 			}
@@ -153,15 +166,15 @@ public void onClick(DialogInterface dialog, int id) {
 		usageDialog.show();
 	}
 
-	public static boolean isNowPlayingVisible() {
-		return nowPlayingVisible;
+	public static boolean isApplicationVisible() {
+		return isApplicationVisible;
 	}
 
-	public static void nowPlayingResumed() {
-		nowPlayingVisible = true;
+	public static void applicationResumed() {
+		isApplicationVisible = true;
 	}
 
-	public static void nowPlayingPaused() {
-		nowPlayingVisible = false;
+	public static void applicationPaused() {
+		isApplicationVisible = false;
 	}
 }

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

@@ -798,6 +798,7 @@ public void onClick(DialogInterface dialog, int id) {
 						mPrefsEditor.commit();
 						localScan.showPlexClients(VoiceControlForPlexApplication.clients);
 					} else {
+						localScan.hideSearchDialog();
 						AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
 						builder.setTitle(R.string.no_clients_found);
 						builder.setCancelable(false)
@@ -883,6 +884,7 @@ protected void onDestroy() {
 	@Override
 	protected void onPause() {
 		super.onPause();
+		VoiceControlForPlexApplication.applicationPaused();
 		if(gdmReceiver != null) {
 			LocalBroadcastManager.getInstance(this).unregisterReceiver(gdmReceiver);
 		}
@@ -891,6 +893,7 @@ protected void onPause() {
 	@Override
 	protected void onResume() {
 		super.onResume();
+		VoiceControlForPlexApplication.applicationResumed();
 		if(gdmReceiver != null) {
 			IntentFilter filters = new IntentFilter();
 			filters.addAction(GDMService.MSG_RECEIVED);

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

@@ -49,6 +49,7 @@ public class NowPlayingActivity extends Activity {
 	private int commandId = 0;
 	private int subscriptionPort = 7777;
 	private boolean subscribed = false;
+	private boolean subscriptionHasStarted = false;
 	private ServerSocket serverSocket;
 	Thread serverThread = null;
 	Handler updateConversationHandler;
@@ -252,14 +253,17 @@ else if(playingTrack != null)
 			if(type != null) {
 				Timeline timeline = mc.getTimeline(type);
 				// If the playing media has stopped, unsubscribe then exit from this activity.
-				if(timeline.state.equals("stopped")) {
+				if(timeline.state.equals("stopped") && subscriptionHasStarted) {
 					unsubscribe(new Runnable() {
 						@Override
 						public void run() {
-							if(VoiceControlForPlexApplication.isNowPlayingVisible())
+							subscriptionHasStarted = false;
+							if(VoiceControlForPlexApplication.isApplicationVisible())
 								finish();
 						}
 					});
+				} else if(timeline.state.equals("playing")) {
+					subscriptionHasStarted = true;
 				}
 			}
 		}
@@ -268,14 +272,15 @@ public void run() {
 	@Override
 	protected void onPause() {
 		super.onPause();
-		VoiceControlForPlexApplication.nowPlayingPaused();
+		VoiceControlForPlexApplication.applicationPaused();
 		Logger.d("now playing paused");
 	}
 
 	@Override
 	protected void onResume() {
 		super.onResume();
-		VoiceControlForPlexApplication.nowPlayingResumed();
+		Logger.d("now playing resumed");
+		VoiceControlForPlexApplication.applicationResumed();
 	}
 
 	private void subscribe() {
@@ -325,7 +330,8 @@ public void onSuccess(PlexResponse response) {
 
 			@Override
 			public void onFailure(Throwable error) {
-
+				// TODO: Handle failure here?
+				Logger.d("failure unsubscribing");
 			}
 		});
 	}

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

@@ -34,6 +34,7 @@ public void writeToParcel(Parcel parcel, int i) {
 		parcel.writeString(version);
 		parcel.writeString(product);
 		parcel.writeString(address);
+		parcel.writeString(machineIdentifier);
 	}
 
 	public PlexClient(Parcel in) {
@@ -42,6 +43,7 @@ public PlexClient(Parcel in) {
 		version = in.readString();
 		product = in.readString();
 		address = in.readString();
+		machineIdentifier = in.readString();
 	}
 
 	public static final Parcelable.Creator<PlexClient> CREATOR = new Parcelable.Creator<PlexClient>() {

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

@@ -7,7 +7,7 @@
 public class Timeline {
 	@Attribute
 	public String state;
-	@Attribute
+	@Attribute(required=false)
 	public String time;
 	@Attribute
 	public String type;

Voice Control For Plex/src/main/java/us/nineworlds/serenity/GDMReceiver.java

@@ -1,6 +1,7 @@
 package us.nineworlds.serenity;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -28,72 +29,30 @@ public void onReceive(Context context, Intent intent) {
 			String ipAddress = intent.getStringExtra("ipaddress").substring(1);
 
 			Logger.d("message: %s", message);
-			
-
-
-			Pattern p;
-			Matcher matcher;
-
-			p = Pattern.compile( "Content-Type: ([^\r]+)", Pattern.DOTALL);
-			matcher = p.matcher(message);
-			matcher.find();
-			String contentType = matcher.group(1);
-
-			p = Pattern.compile( "Name: ([^\r]+)", Pattern.DOTALL);
-			matcher = p.matcher(message);
-			matcher.find();
-			String name = matcher.group(1);
-
-			p = Pattern.compile( "Port: ([^\r]+)", Pattern.DOTALL);
-			matcher = p.matcher(message);
-			matcher.find();
-			String port = matcher.group(1);
-
-			p = Pattern.compile( "Protocol: ([^\r]+)", Pattern.DOTALL);
-			matcher = p.matcher(message);
-			String protocol = "";
-			if(matcher.find())
-				protocol = matcher.group(1);
-
-			p = Pattern.compile( "Version: ([0-9a-f-]+)", Pattern.DOTALL);
-			matcher = p.matcher(message);
-			String version = "";
-			if(matcher.find())
-				version = matcher.group(1);
-
-
-			p = Pattern.compile( "Resource-Identifier: ([0-9a-f-]+)", Pattern.DOTALL);
-			matcher = p.matcher(message);
-
-
-			if(matcher.find()) {
-        String machineIdentifier = matcher.group(1);
-
-				if(contentType.equals("plex/media-server")) {
+			HashMap<String, String> responseMap = processResponse(message);
 
+			if(responseMap.get("resource-identifier") != null) {
+				if(responseMap.get("content-type").equals("plex/media-server")) {
 					PlexServer server = new PlexServer();
-					server.port = port;
-					server.name = name;
+					server.port = responseMap.get("port");
+					server.name = responseMap.get("name");
 					server.address = ipAddress;
-					server.machineIdentifier = machineIdentifier;
-					server.version = version;
+					server.machineIdentifier = responseMap.get("resource-identifier");
+					server.version = responseMap.get("version");
 					server.local = true;
 					Connection connection = new Connection("http", server.address, server.port);
 					server.connections = new ArrayList<Connection>();
 					server.connections.add(connection);
 					VoiceControlForPlexApplication.addPlexServer(server);
-				} else if(contentType.equals("plex/media-player") && protocol.equals("plex")) {
+				} else if(responseMap.get("content-type").equals("plex/media-player") && responseMap.get("protocol") != null && responseMap.get("protocol").equals("plex")) {
 					PlexClient client = new PlexClient();
-					client.port = port;
-					client.name = name;
+					client.port = responseMap.get("port");
+					client.name = responseMap.get("name");
 					client.address = ipAddress;
-					client.machineIdentifier = machineIdentifier;
-					client.version = version;
+					client.machineIdentifier = responseMap.get("resource-identifier");
+					client.version = responseMap.get("version");
 
-					p = Pattern.compile( "Product: ([^\r]+)", Pattern.DOTALL);
-					matcher = p.matcher(message);
-					if(matcher.find())
-						client.product = matcher.group(1);
+					client.product = responseMap.get("product");
 					clients.add(client);
 				}
       }
@@ -126,4 +85,19 @@ public void onReceive(Context context, Intent intent) {
 			}
 		}
 	}
+
+	private HashMap<String, String> processResponse(String response) {
+		HashMap<String, String> responseMap = new HashMap<String, String>();
+		String[] lines = response.split("[\n\r]");
+
+		Pattern p = Pattern.compile("([^:]+): ([^\r^\n]+)");
+		Matcher matcher;
+		for(String line : lines) {
+			matcher = p.matcher(line);
+			if(matcher.find()) {
+				responseMap.put(matcher.group(1).toLowerCase(), matcher.group(2));
+			}
+		}
+		return responseMap;
+	}
 }

Voice Control For Plex/src/main/res/values-fr/strings.xml

@@ -96,4 +96,5 @@
     <string name="searching_for_plex_clients">Searching for Plex Clients</string>
     <string name="select_plex_client">Select a Plex Client</string>
     <string name="no_servers_found">No Plex Servers Found</string>
+    <string name="no_clients_found">No Plex Clients Found</string>
 </resources>