When adding locally found servers, if a server was already found via remote scan (via plex.tv), use that one so that its remote connections are included.

Author: Chris Bellew

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

@@ -215,11 +215,20 @@ public static void addPlexServer(final PlexServer server) {
 		addPlexServer(server, null);
 	}
 
-	public static void addPlexServer(final PlexServer server, final Runnable onFinish) {
-		Logger.d("ADDING PLEX SERVER: %s, %s", server.name, server.address);
-		if(server.name.equals("") || server.address.equals("")) {
+	public static void addPlexServer(PlexServer addedServer, final Runnable onFinish) {
+		Logger.d("ADDING PLEX SERVER: %s, %s", addedServer.name, addedServer.address);
+		if(addedServer.name.equals("") || addedServer.address.equals("")) {
 			return;
 		}
+    PlexServer serverToAdd = null;
+    // First, see if we've already found this server from a remote scan. We'll want to use that one instead so the remote connections are included
+    for(PlexServer _server : VoiceControlForPlexApplication.servers.values()) {
+      if(_server.machineIdentifier.equals(addedServer.machineIdentifier)) {
+        serverToAdd = _server;
+        break;
+      }
+    }
+    final PlexServer server = serverToAdd == null ? addedServer : serverToAdd;
     try {
       server.findServerConnection(new ServerFindHandler() {
         @Override

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

@@ -42,9 +42,10 @@ public int describeContents() {
 
 
 	public String toString() {
-		String out = String.format("Address: %s", address);
-		out += String.format("Port: %s", port);
-		out += String.format("Protocol: %s", protocol);
+    String out = String.format("%s://%s:%s", protocol, address, port);
+//		String out = String.format("Address: %s", address);
+//		out += String.format("Port: %s", port);
+//		out += String.format("Protocol: %s", protocol);
 		return out;
 	}