Improved local client discovery; Scan all of a Plex Media Server's connections to find one that works. This will enable viewing content from a server you own but are trying to view from remotely.

Author: Chris Bellew

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

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.atomjack.vcfp"
     android:versionCode="15"
-    android:versionName="1.8.1b" >
+    android:versionName="1.8.1b1" >
 
     <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/GDMService.java

@@ -16,24 +16,27 @@
 public class GDMService extends IntentService {
     public static final String MSG_RECEIVED = ".GDMService.MESSAGE_RECEIVED";
     public static final String SOCKET_CLOSED = ".GDMService.SOCKET_CLOSED";
-    
+
+
     public GDMService() {
         super("GDMService");
     }
+
     @Override
     protected void onHandleIntent(Intent intent) {
 			try
 			{
 				String origin = intent.getStringExtra("ORIGIN") == null ? "" : intent.getStringExtra("ORIGIN");
 				String queryText = intent.getStringExtra("queryText");
+				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";
-				DatagramPacket packet = new DatagramPacket(data.getBytes(), data.length(), getBroadcastAddress(), 32414);
+				DatagramPacket packet = new DatagramPacket(data.getBytes(), data.length(), getBroadcastAddress(), port);
 				socket.send(packet);
 				Logger.i("Search Packet Broadcasted");
 
-				byte[] buf = new byte[256];
+				byte[] buf = new byte[8096];
 				packet = new DatagramPacket(buf, buf.length);
 				socket.setSoTimeout(2000);
 				boolean listening = true;
@@ -43,7 +46,8 @@ protected void onHandleIntent(Intent intent) {
 					{
 						socket.receive(packet);
 						String packetData = new String(packet.getData());
-						if (packetData.contains("HTTP/1.0 200 OK"))
+						if (packetData.startsWith("HTTP/1.0 200 OK") ||
+								packetData.startsWith("HELLO * HTTP/1.0")) // A version of the Roku is known to send this invalid response.
 						{
 							Logger.i("PMS Packet Received");
 							//Broadcast Received Packet
@@ -63,6 +67,7 @@ protected void onHandleIntent(Intent intent) {
 						Intent socketBroadcast = new Intent(GDMService.SOCKET_CLOSED);
 						socketBroadcast.putExtra("ORIGIN", origin);
 						socketBroadcast.putExtra("class", intent.getSerializableExtra("class"));
+						socketBroadcast.putExtra(VoiceControlForPlexApplication.Intent.SCAN_TYPE, intent.getStringExtra(VoiceControlForPlexApplication.Intent.SCAN_TYPE));
 						if(queryText != null) {
 							socketBroadcast.putExtra("queryText", queryText);
 						}

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

@@ -61,6 +61,7 @@ public void searchForPlexServers() {
 		mServiceIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
 		mServiceIntent.putExtra("ORIGIN", theClass.getSimpleName());
 		mServiceIntent.putExtra("class", theClass);
+		mServiceIntent.putExtra(VoiceControlForPlexApplication.Intent.SCAN_TYPE, "server");
 		context.startService(mServiceIntent);
 	}
 
@@ -96,102 +97,37 @@ public void onItemClick(AdapterView<?> parentAdapter, View view, int position, l
 		});
 	}
 
-	public void getClients() {
-		getClients(new PlexServer("none"));
-	}
-
-	public void getClients(PlexServer _server) {
+	public void searchForPlexClients() {
+		Logger.d("searchForPlexClients()");
 		if(!VoiceControlForPlexApplication.isWifiConnected(context)) {
 			VoiceControlForPlexApplication.showNoWifiDialog(context);
 			return;
 		}
-		server = _server;
-		if(_server.name.equals("none"))
-			server = gson.fromJson(mPrefs.getString("Server", ""), PlexServer.class);
-		if(server == null || server.name.equals(context.getResources().getString(R.string.scan_all))) {
-			scanForClients();
-		} else {
-			getClients(new MediaContainer());
-		}
-	}
 
-	public void getClients(MediaContainer mc) {
-		PlexServer server = gson.fromJson(mPrefs.getString("Server", ""), PlexServer.class);
-		if(mc.machineIdentifier != null) {
-			server.machineIdentifier = mc.machineIdentifier;
-			SharedPreferences.Editor mPrefsEditor = mPrefs.edit();
-			mPrefsEditor.putString("Server", gson.toJson(server));
-			mPrefsEditor.commit();
-		}
-		if(searchDialog == null) {
-			searchDialog = new Dialog(context);
-		}
+		searchDialog = new Dialog(context);
 
 		searchDialog.setContentView(R.layout.search_popup);
-		searchDialog.setTitle("Searching for Plex Clients");
+		searchDialog.setTitle(context.getResources().getString(R.string.searching_for_plex_clients));
 
 		searchDialog.show();
-		PlexHttpClient.get(server, "/clients", new PlexHttpMediaContainerHandler() {
-			@Override
-			public void onSuccess(MediaContainer clientMC) {
-				// Exclude non-Plex Home Theater clients (pre 1.0.7)
-				Map<String, PlexClient> clients = new HashMap<String, PlexClient>();
-				for (int i = 0; i < clientMC.clients.size(); i++) {
-					if (!VoiceControlForPlexApplication.isVersionLessThan(clientMC.clients.get(i).version, VoiceControlForPlexApplication.MINIMUM_PHT_VERSION) || !clientMC.clients.get(i).product.equals("Plex Home Theater")) {
-						clients.put(clientMC.clients.get(i).name, clientMC.clients.get(i));
-					}
-				}
 
-				searchDialog.dismiss();
-				if (clients.size() == 0) {
-					AlertDialog.Builder builder = new AlertDialog.Builder(context);
-					builder.setTitle("No Plex Clients Found");
-					builder.setCancelable(false)
-									.setNeutralButton(R.string.ok, new DialogInterface.OnClickListener() {
-										public void onClick(DialogInterface dialog, int id) {
-											dialog.cancel();
-										}
-									});
-					AlertDialog d = builder.create();
-					d.show();
-				} else {
-					Logger.d("Clients: " + clients.size());
-					SharedPreferences.Editor mPrefsEditor = mPrefs.edit();
-					mPrefsEditor.putString(Preferences.SAVED_CLIENTS, gson.toJson(clients));
-					mPrefsEditor.commit();
-					showPlexClients(clients);
-				}
-			}
-
-			@Override
-			public void onFailure(Throwable error) {
-				searchDialog.dismiss();
-				feedback.e(context.getResources().getString(R.string.got_error), error.getMessage());
-			}
-		});
-	}
-
-	public void scanForClients() {
-		if(searchDialog == null) {
-			searchDialog = new Dialog(context);
-		}
-
-		searchDialog.setContentView(R.layout.search_popup);
-		searchDialog.setTitle("Searching for Plex Clients");
-
-		searchDialog.show();
 		Intent mServiceIntent = new Intent(context, GDMService.class);
-		mServiceIntent.putExtra("ORIGIN", "ScanForClients");
+		mServiceIntent.putExtra("port", 32412); // Port for clients
+		mServiceIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+		mServiceIntent.putExtra("ORIGIN", theClass.getSimpleName());
 		mServiceIntent.putExtra("class", theClass);
+		mServiceIntent.putExtra(VoiceControlForPlexApplication.Intent.SCAN_TYPE, "client");
 		context.startService(mServiceIntent);
 	}
 
 	public void showPlexClients(Map<String, PlexClient> clients) {
+		if(searchDialog != null)
+			searchDialog.dismiss();
 		if(serverSelectDialog == null) {
 			serverSelectDialog = new Dialog(context);
 		}
 		serverSelectDialog.setContentView(R.layout.server_select);
-		serverSelectDialog.setTitle("Select a Plex Client");
+		serverSelectDialog.setTitle(R.string.select_plex_client);
 		serverSelectDialog.show();
 
 		final ListView serverListView = (ListView)serverSelectDialog.findViewById(R.id.serverListView);