Refresh servers after logging in, in case user subsequently restricts access to their server to authentication, so we can get the access token for that server.

Author: Chris Bellew

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

@@ -71,8 +71,17 @@ public void e(int id) {
 		feedback(context.getString(id), true);
 	}
 
+	public void t(int id) {
+		feedback(context.getString(id), true, true);
+	}
+
 	private void feedback(String text, boolean errors) {
-		if(mPrefs.getInt(errors ? "errors" : "feedback", MainActivity.FEEDBACK_TOAST) == MainActivity.FEEDBACK_VOICE) {
+		feedback(text, errors, false);
+	}
+
+	private void feedback(String text, boolean errors, boolean forceToast) {
+
+		if(!forceToast && mPrefs.getInt(errors ? "errors" : "feedback", MainActivity.FEEDBACK_TOAST) == MainActivity.FEEDBACK_VOICE) {
 			TextToSpeech tts = errors ? errorsTts : feedbackTts;
 			if (tts == null) {
 				// This tts not set up yet, so initiate it and add the text to be spoken to the appropriate queue.

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

@@ -66,6 +66,7 @@ protected void onHandleIntent(Intent intent) {
 						listening = false;
 						Intent socketBroadcast = new Intent(GDMService.SOCKET_CLOSED);
 						socketBroadcast.putExtra("ORIGIN", origin);
+						socketBroadcast.putExtra(VoiceControlForPlexApplication.Intent.EXTRA_SILENT, intent.getBooleanExtra(VoiceControlForPlexApplication.Intent.EXTRA_SILENT, false));
 						socketBroadcast.putExtra("class", intent.getSerializableExtra("class"));
 						socketBroadcast.putExtra(VoiceControlForPlexApplication.Intent.SCAN_TYPE, intent.getStringExtra(VoiceControlForPlexApplication.Intent.SCAN_TYPE));
 						if(queryText != null) {

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

@@ -45,22 +45,29 @@ public LocalScan(Context ctx, Class cls, SharedPreferences prefs, ScanHandler ha
 	}
 
 	public void searchForPlexServers() {
+		searchForPlexServers(false);
+	}
+
+	public void searchForPlexServers(boolean silent) {
 		Logger.d("searchForPlexServers()");
 		if(!VoiceControlForPlexApplication.isWifiConnected(context)) {
 			VoiceControlForPlexApplication.showNoWifiDialog(context);
 			return;
 		}
 
-		searchDialog = new Dialog(context);
+		if(!silent) {
+			searchDialog = new Dialog(context);
 
-		searchDialog.setContentView(R.layout.search_popup);
-		searchDialog.setTitle(context.getResources().getString(R.string.searching_for_plex_servers));
+			searchDialog.setContentView(R.layout.search_popup);
+			searchDialog.setTitle(context.getResources().getString(R.string.searching_for_plex_servers));
 
-		searchDialog.show();
+			searchDialog.show();
+		}
 
 		Intent mServiceIntent = new Intent(context, GDMService.class);
 		mServiceIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
 		mServiceIntent.putExtra("ORIGIN", theClass.getSimpleName());
+		mServiceIntent.putExtra(VoiceControlForPlexApplication.Intent.EXTRA_SILENT, silent);
 		mServiceIntent.putExtra("class", theClass);
 		mServiceIntent.putExtra(VoiceControlForPlexApplication.Intent.SCAN_TYPE, "server");
 		context.startService(mServiceIntent);

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

@@ -15,7 +15,9 @@
 import org.simpleframework.xml.Serializer;
 import org.simpleframework.xml.core.Persister;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class RemoteScan {
@@ -35,6 +37,15 @@ public interface RefreshResourcesResponseHandler {
 	}
 
 	public void refreshResources(String authToken, final RefreshResourcesResponseHandler responseHandler) {
+		refreshResources(authToken, responseHandler, false);
+	}
+
+	public void refreshResources(String authToken) {
+		refreshResources(authToken, null, true);
+	}
+
+
+	public void refreshResources(String authToken, final RefreshResourcesResponseHandler responseHandler, boolean silent) {
 		VoiceControlForPlexApplication.servers = new ConcurrentHashMap<String, PlexServer>();
 		VoiceControlForPlexApplication.clients = new HashMap<String, PlexClient>();
 		String url = String.format("https://plex.tv/pms/resources?%s=%s", PlexHeaders.XPlexToken, authToken);
@@ -53,15 +64,16 @@ public void onSuccess(int statusCode, org.apache.http.Header[] headers, byte[] r
 						e.printStackTrace();
 					}
 					Logger.d("got %d devices", mediaContainer.devices.size());
-					for(Device device : mediaContainer.devices) {
+
+					List<PlexServer> servers = new ArrayList<PlexServer>();
+					for(final Device device : mediaContainer.devices) {
 						if(device.lastSeenAt < System.currentTimeMillis()/1000 - (60*60*24))
 							continue;
 						if(device.provides.contains("server")) {
 
 							PlexServer server = PlexServer.fromDevice(device);
 							Logger.d("Device %s is a server, has %d connections", server.name, server.connections.size());
-							VoiceControlForPlexApplication.addPlexServer(server);
-
+							servers.add(server);
 						} else if(device.provides.contains("player")) {
 							Logger.d("Device %s is a player", device.name);
 							PlexClient client = PlexClient.fromDevice(device);
@@ -75,7 +87,26 @@ public void onSuccess(int statusCode, org.apache.http.Header[] headers, byte[] r
 					mPrefs.edit().putString(Preferences.SAVED_CLIENTS, gson.toJson(VoiceControlForPlexApplication.clients));
 					mPrefs.edit().commit();
 
-					responseHandler.onSuccess();
+					final int[] serversScanned = new int[1];
+					serversScanned[0] = 0;
+					final int numServers = servers.size();
+					for(final PlexServer server : servers) {
+						VoiceControlForPlexApplication.addPlexServer(server, new Runnable() {
+							@Override
+							public void run() {
+								Logger.d("Done scanning %s", server.name);
+								serversScanned[0]++;
+								Logger.d("%d out of %d servers scanned", serversScanned[0], numServers);
+								if(serversScanned[0] >= numServers && responseHandler != null)
+									responseHandler.onSuccess();
+							}
+						});
+					}
+
+
+
+
+
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
@@ -85,8 +116,8 @@ public void onSuccess(int statusCode, org.apache.http.Header[] headers, byte[] r
 			public void onFailure(int statusCode, org.apache.http.Header[] headers, byte[] responseBody, java.lang.Throwable error) {
 				Logger.d("Failure getting resources: %d", statusCode);
 				error.printStackTrace();
-				responseHandler.onFailure(statusCode);
-//				responseHandler.onFailure(error);
+				if(responseHandler != null)
+					responseHandler.onFailure(statusCode);
 			}
 		});
 	}

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

@@ -1,5 +1,6 @@
 package com.atomjack.vcfp;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -36,6 +37,8 @@ public final static class Intent {
 			public final static String EXTRA_SERVER = "com.atomjack.vcfp.intent.extra_server";
 			public final static String EXTRA_CLIENT = "com.atomjack.vcfp.intent.extra_client";
 			public final static String EXTRA_RESUME = "com.atomjack.vcfp.intent.extra_resume";
+			public final static String EXTRA_SILENT = "com.atomjack.vcfp.intent.extra_silent";
+
 
 			public final static String SCAN_TYPE = "com.atomjack.vcfp.intent.scan_type";
 			public final static String EXTRA_SERVERS = "com.atomjack.vcfp.intent.extra_servers";
@@ -76,6 +79,10 @@ public static String getUUID(SharedPreferences mPrefs) {
 	}
 
 	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("")) {
 			return;
@@ -102,6 +109,9 @@ public void onSuccess(int statusCode, org.apache.http.Header[] headers, byte[] r
 								} catch (Exception e) {
 									e.printStackTrace();
 								}
+								server.movieSections = new ArrayList<String>();
+								server.tvSections = new ArrayList<String>();
+								server.musicSections = new ArrayList<String>();
 								for(int i=0;i<mc.directories.size();i++) {
 									if(mc.directories.get(i).type.equals("movie")) {
 										server.addMovieSection(mc.directories.get(i).key);
@@ -114,17 +124,20 @@ public void onSuccess(int statusCode, org.apache.http.Header[] headers, byte[] r
 									}
 								}
 								Logger.d("%s has %d directories.", server.name, mc.directories != null ? mc.directories.size() : 0);
-								if(!server.name.equals("") && !server.address.equals("")) {
+								if(!server.name.equals("")) {
 									servers.put(server.name, server);
 									Logger.d("Added %s.", server.name);
 								}
+								if(onFinish != null)
+									onFinish.run();
 							}
 						});
 					}
 
 					@Override
 					public void onFailure(int statusCode) {
 						// TODO: Handle failure here
+						Logger.d("Failed to find connection for %s: %d", server.name, statusCode);
 					}
 				});
 

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

@@ -112,6 +112,7 @@ public class MainActivity extends Activity implements TextToSpeech.OnInitListene
 	private TextToSpeech tts;
 
 	Menu menu;
+	private Dialog searchDialog;
 
 	private String authToken;
 
@@ -315,12 +316,16 @@ public void onItemClick(AdapterView<?> adapter, View view, int position,
 						return;
 					}
 					if(authToken != null) {
-						Logger.d("Logged in");
+						searchDialog = new Dialog(MainActivity.this);
+
+						searchDialog.setContentView(R.layout.search_popup);
+						searchDialog.setTitle(getResources().getString(R.string.searching_for_plex_servers));
+
+						searchDialog.show();
 						remoteScan.refreshResources(authToken, new RemoteScan.RefreshResourcesResponseHandler() {
 							@Override
 							public void onSuccess() {
-								Logger.d("server: %s", VoiceControlForPlexApplication.servers.get("callandor"));
-								localScan.searchForPlexServers();
+								localScan.searchForPlexServers(true);
 							}
 
 							@Override
@@ -580,6 +585,17 @@ public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) {
 								public void run() {
 									feedback.m(R.string.logged_in);
 									switchLogin();
+									remoteScan.refreshResources(authToken, new RemoteScan.RefreshResourcesResponseHandler() {
+										@Override
+										public void onSuccess() {
+											feedback.t(R.string.servers_refreshed);
+										}
+
+										@Override
+										public void onFailure(int statusCode) {
+											feedback.e(R.string.remote_scan_error);
+										}
+									});
 								}
 							});
 							// We got the auth token, so cancel this task
@@ -773,6 +789,8 @@ public void onNewIntent(Intent intent) {
 
 					mPrefsEditor.putString(Preferences.SAVED_SERVERS, gson.toJson(VoiceControlForPlexApplication.servers));
 					mPrefsEditor.commit();
+					if(searchDialog != null)
+						searchDialog.dismiss();
 					if (VoiceControlForPlexApplication.servers.size() > 0) {
 						localScan.showPlexServers();
 					} else {

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

@@ -10,6 +10,7 @@
 import android.widget.ScrollView;
 import android.widget.TextView;
 
+import com.atomjack.vcfp.BuildConfig;
 import com.atomjack.vcfp.Logger;
 import com.atomjack.vcfp.PlexHeaders;
 import com.atomjack.vcfp.QueryString;
@@ -23,6 +24,7 @@
 import com.atomjack.vcfp.model.Timeline;
 import com.atomjack.vcfp.net.PlexHttpClient;
 import com.atomjack.vcfp.net.PlexHttpResponseHandler;
+import com.bugsense.trace.BugSenseHandler;
 
 import org.apache.http.Header;
 import org.apache.http.message.BasicHeader;
@@ -47,7 +49,7 @@ public class NowPlayingActivity extends Activity {
 	private PlexClient client = null;
 
 	private int commandId = 0;
-	private int subscriptionPort = 7777;
+	private int subscriptionPort = 59409;
 	private boolean subscribed = false;
 	private boolean subscriptionHasStarted = false;
 	private ServerSocket serverSocket;
@@ -64,7 +66,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
 		mPrefs = getSharedPreferences(MainActivity.PREFS, MODE_PRIVATE);
 
-//		BugSenseHandler.initAndStartSession(NowPlayingActivity.this, MainActivity.BUGSENSE_APIKEY);
+		if(BuildConfig.USE_BUGSENSE)
+			BugSenseHandler.initAndStartSession(NowPlayingActivity.this, MainActivity.BUGSENSE_APIKEY);
 
 		setContentView(R.layout.play_media);
 
@@ -258,6 +261,14 @@ else if(playingTrack != null)
 						@Override
 						public void run() {
 							subscriptionHasStarted = false;
+							serverThread.interrupt();
+							try {
+								if (serverSocket != null) {
+									serverSocket.close();
+								}
+							} catch (Exception ex) {
+								ex.printStackTrace();
+							}
 							if(VoiceControlForPlexApplication.isApplicationVisible())
 								finish();
 						}
@@ -343,7 +354,12 @@ protected void onDestroy() {
 			if(subscribed) {
 				unsubscribe();
 				serverThread.interrupt();
-				serverSocket.close();
+				if(serverSocket != null) {
+					serverSocket.close();
+					Logger.d("Closed serverSocket");
+				} else {
+					Logger.d("ServerSocket was null");
+				}
 			}
 		} catch(Exception ex) {
 			ex.printStackTrace();

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

@@ -41,6 +41,13 @@ 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);
+		return out;
+	}
+
 	@Attribute
 	public String uri;
 	public boolean local;

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

@@ -94,7 +94,8 @@
     <string name="login_unauthorized">Sorry, but I got an unauthorized login error. You will have to login again.</string>
     <string name="remote_scan_error">Sorry, but I got an error trying to access myPlex. You may have to logout and log back in.</string>
     <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>
+    <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>
+    <string name="servers_refreshed">Servers refreshed.</string>
 </resources>