Make sure there's a viewOffset before trying to set it when playing a video or track; Show message when no clients found; Use access token if one exists when testing servers for connections; Fixed bug in server connection test.

Author: Chris Bellew

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

@@ -184,7 +184,6 @@ private void startup() {
 		shows = new ArrayList<PlexDirectory>();
 
 		Gson gson = new Gson();
-		Logger.d("default server json: %s", mPrefs.getString("Server", ""));
 		final PlexServer defaultServer = gson.fromJson(mPrefs.getString("Server", ""), PlexServer.class);
 		if(specifiedServer != null && client != null && !specifiedServer.name.equals(getResources().getString(R.string.scan_all))) {
 			// got a specified server and client from a shortcut
@@ -799,7 +798,7 @@ private void playVideo(final PlexVideo video, String transientToken) {
 			qs.add("address", video.server.activeConnection.address);
 			Logger.d("address: %s", video.server.activeConnection.address);
 
-			if(mPrefs.getBoolean("resume", false) || resumePlayback)
+			if((mPrefs.getBoolean("resume", false) || resumePlayback) && video.viewOffset != null)
 				qs.add("viewOffset", video.viewOffset);
 			if(transientToken != null)
 				qs.add("token", transientToken);
@@ -1529,7 +1528,7 @@ private void playTrack(final PlexTrack track, final PlexDirectory album) {
 		qs.add("address", track.server.activeConnection.address);
 		if(album != null)
 			qs.add("containerKey", album.key);
-		if(mPrefs.getBoolean("resume", false) || resumePlayback)
+		if((mPrefs.getBoolean("resume", false) || resumePlayback) && track.viewOffset != null)
 			qs.add("viewOffset", track.viewOffset);
 		qs.add(PlexHeaders.XPlexTargetClientIdentifier, client.machineIdentifier);
 		String url = String.format("http://%s:%s/player/playback/playMedia?%s", client.address, client.port, qs);

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

@@ -793,13 +793,28 @@ public void onClick(DialogInterface dialog, int id) {
 					}
 				} else if(intent.getStringExtra(VoiceControlForPlexApplication.Intent.SCAN_TYPE).equals("client")) {
 					ArrayList<PlexClient> clients = intent.getParcelableArrayListExtra(VoiceControlForPlexApplication.Intent.EXTRA_CLIENTS);
-					VoiceControlForPlexApplication.clients = new HashMap<String, PlexClient>();
-					for(PlexClient c : clients) {
-						VoiceControlForPlexApplication.clients.put(c.name, c);
+					if(clients != null) {
+						VoiceControlForPlexApplication.clients = new HashMap<String, PlexClient>();
+						for (PlexClient c : clients) {
+							VoiceControlForPlexApplication.clients.put(c.name, c);
+						}
+						mPrefsEditor.putString(Preferences.SAVED_CLIENTS, gson.toJson(VoiceControlForPlexApplication.clients));
+						mPrefsEditor.commit();
+						localScan.showPlexClients(VoiceControlForPlexApplication.clients);
+					} else {
+						if (searchDialog != null)
+							searchDialog.hide();
+						AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
+						builder.setTitle(R.string.no_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();
 					}
-					mPrefsEditor.putString(Preferences.SAVED_CLIENTS, gson.toJson(VoiceControlForPlexApplication.clients));
-					mPrefsEditor.commit();
-					localScan.showPlexClients(VoiceControlForPlexApplication.clients);
 				}
 			} else if(origin.equals("ScanForClients")) {
 				// No default server specified, so we need to search all servers for all clients

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

@@ -4,6 +4,7 @@
 import android.os.Parcelable;
 
 import com.atomjack.vcfp.Logger;
+import com.atomjack.vcfp.PlexHeaders;
 import com.atomjack.vcfp.ServerFindHandler;
 import com.atomjack.vcfp.ServerTestHandler;
 import com.loopj.android.http.AsyncHttpClient;
@@ -13,6 +14,7 @@
 import java.util.List;
 
 import org.apache.http.Header;
+import org.apache.http.message.BasicHeader;
 import org.simpleframework.xml.Root;
 
 @Root(strict=false)
@@ -162,7 +164,7 @@ public void onFinish(boolean available) {
 				} else {
 					int newConnectionIndex = connectionIndex + 1;
 					// TODO: Fix this
-					if(connections.size() < newConnectionIndex)
+					if(connections.size() <= newConnectionIndex)
 						handler.onFailure();
 					else
 						findServerConnection(newConnectionIndex, handler);
@@ -176,6 +178,8 @@ private void testServerConnection(final Connection connection, final ServerTestH
 		Logger.d("testServerConnection: fetching %s", connection.uri);
 		// Set timeout to 2 seconds, we don't want this to take too long
 		httpClient.setTimeout(2000);
+		if(accessToken != null)
+			httpClient.addHeader(PlexHeaders.XPlexToken, accessToken);
 		httpClient.get(connection.uri, new AsyncHttpResponseHandler() {
 			@Override
 			public void onSuccess(int statusCode, org.apache.http.Header[] headers, byte[] responseBody) {

Voice Control For Plex/src/main/res/values/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>