Added Plex login.

Author: Chris Bellew

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

@@ -57,10 +57,18 @@ public void m(String text) {
 		feedback(text, false);
 	}
 
+	public void m(int id) {
+		feedback(context.getString(id), false);
+	}
+
 	public void e(String text) {
 		feedback(text, true);
 	}
 
+	public void e(int id) {
+		feedback(context.getString(id), true);
+	}
+
 	private void feedback(String text, boolean errors) {
 		if(mPrefs.getInt(errors ? "errors" : "feedback", MainActivity.FEEDBACK_TOAST) == MainActivity.FEEDBACK_VOICE) {
 			TextToSpeech tts = errors ? errorsTts : feedbackTts;

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

@@ -26,15 +26,15 @@ public class LocalScan {
 	private Class theClass;
 	private Dialog searchDialog;
 	private Dialog serverSelectDialog = null;
-	private LocalScanHandler scanHandler;
+	private ScanHandler scanHandler;
 	private SharedPreferences mPrefs;
 	private Gson gson = new Gson();
 	private Feedback feedback;
 	private int serversScanned = 0;
 	private Map<String, PlexClient> m_clients = new HashMap<String, PlexClient>();
 	private PlexServer server;
 
-	public LocalScan(Context ctx, Class cls, SharedPreferences prefs, LocalScanHandler handler) {
+	public LocalScan(Context ctx, Class cls, SharedPreferences prefs, ScanHandler handler) {
 		context = ctx;
 		theClass = cls;
 		scanHandler = handler;
@@ -79,7 +79,7 @@ public void showPlexServers(ConcurrentHashMap<String, PlexServer> servers) {
 
 		final ListView serverListView = (ListView)serverSelectDialog.findViewById(R.id.serverListView);
 		if(servers == null)
-			servers = new ConcurrentHashMap<String, PlexServer>(VoiceControlForPlexApplication.getPlexMediaServers());
+			servers = new ConcurrentHashMap<String, PlexServer>(VoiceControlForPlexApplication.servers);
 		final PlexListAdapter adapter = new PlexListAdapter(context, PlexListAdapter.TYPE_SERVER);
 		adapter.setServers(servers);
 		serverListView.setAdapter(adapter);
@@ -130,7 +130,7 @@ public void getClients(MediaContainer mc) {
 		searchDialog.setTitle("Searching for Plex Clients");
 
 		searchDialog.show();
-		PlexHttpClient.get(server.getClientsURL(), null, new PlexHttpMediaContainerHandler() {
+		PlexHttpClient.get(server, "/clients", new PlexHttpMediaContainerHandler() {
 			@Override
 			public void onSuccess(MediaContainer clientMC) {
 				// Exclude non-Plex Home Theater clients (pre 1.0.7)
@@ -211,12 +211,15 @@ public void onItemClick(AdapterView<?> parentAdapter, View view, int position,
 	}
 
 	public void scanServersForClients() {
-		ConcurrentHashMap<String, PlexServer> servers = VoiceControlForPlexApplication.getPlexMediaServers();
+		ConcurrentHashMap<String, PlexServer> servers = VoiceControlForPlexApplication.servers;
 		Logger.d("ScanServersForClients, number of servers = " + servers.size());
 		serversScanned = 0;
 		for(PlexServer thisServer : servers.values()) {
+			// Skip non-owned servers
+			if(!thisServer.owned)
+				continue;
 			Logger.d("ScanServersForClients server: %s", thisServer.name);
-			PlexHttpClient.get(thisServer.getClientsURL(), null, new PlexHttpMediaContainerHandler()
+			PlexHttpClient.get(thisServer, "/clients", new PlexHttpMediaContainerHandler()
 			{
 				@Override
 				public void onSuccess(MediaContainer clientMC)
@@ -230,7 +233,7 @@ public void onSuccess(MediaContainer clientMC)
 						}
 					}
 
-					if(serversScanned == VoiceControlForPlexApplication.getPlexMediaServers().size()) {
+					if(serversScanned == VoiceControlForPlexApplication.servers.size()) {
 						searchDialog.dismiss();
 						if(m_clients.size() == 0) {
 							AlertDialog.Builder builder = new AlertDialog.Builder(context);

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

@@ -2,29 +2,38 @@
 
 import android.util.Log;
 
+import java.util.regex.Pattern;
+
 public class Logger
 {
-  public static void i(String format, Object ... args)
+
+	private static Pattern XPlexTokenPattern = Pattern.compile("(X-Plex-Token=)([^&])+");
+
+	private static String scrub(String text) {
+		return XPlexTokenPattern.matcher(text).replaceAll("$1<XXXXXXXXXX>");
+	}
+
+	public static void i(String format, Object ... args)
   {
-    String msg = String.format(format, args);
+    String msg = scrub(String.format(format, args));
     Log.i("VoiceControlForPlex", msg);
   }
 
   public static void d(String format, Object ... args)
   {
-    String msg = String.format(format, args);
+    String msg = scrub(String.format(format, args));
     Log.d("VoiceControlForPlex", msg);
   }
 
   public static void w(String format, Object ... args)
   {
-    String msg = String.format(format, args);
+    String msg = scrub(String.format(format, args));
     Log.w("VoiceControlForPlex", msg);
   }
 
   public static void e(String format, Object ... args)
   {
-    String msg = String.format(format, args);
+    String msg = scrub(String.format(format, args));
     Log.e("VoiceControlForPlex", msg);
   }
 }