Subscribe to a player and exit Now Playing screen when the player has exited; Added pin login; Refactored a lot of code.

Author: Chris Bellew

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.atomjack.vcfp"
-    android:versionCode="14"
-    android:versionName="1.8" >
+    android:versionCode="15"
+    android:versionName="1.8.1b" >
 
     <uses-permission android:name="com.mohammadag.googlesearchapi.permission.ACCESS_GGOGLE_SEARCH_API" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -23,7 +23,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".MainActivity"
+            android:name=".activities.MainActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -43,21 +43,21 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".NowPlayingActivity"
+            android:name=".activities.NowPlayingActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
             </intent-filter>
         </activity>
-        <activity android:name=".ShortcutProviderActivity"
+        <activity android:name=".activities.ShortcutProviderActivity"
                   android:theme="@style/Theme.Transparent">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name=".ShortcutActivity"
+        <activity android:name=".activities.ShortcutActivity"
                   android:theme="@android:style/Theme.NoDisplay"
                   android:launchMode="singleInstance">
             <intent-filter>

Voice Control For Plex/src/main/assets/VoiceControlForPlex.prj.xml

@@ -105,7 +105,7 @@ All recognized commands without filter
 		<pids>50,51</pids>
 		<tids>49,46,48</tids>
 		<Img sr="icon" ve="2">
-			<cls>com.atomjack.vcfp.MainActivity</cls>
+			<cls>com.atomjack.vcfp.activities.MainActivity</cls>
 			<pkg>com.atomjack.vcfp</pkg>
 		</Img>
 	</Project>

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

@@ -5,6 +5,8 @@
 import android.speech.tts.TextToSpeech;
 import android.widget.Toast;
 
+import com.atomjack.vcfp.activities.MainActivity;
+
 public class Feedback implements TextToSpeech.OnInitListener {
 	private SharedPreferences mPrefs;
 	private TextToSpeech feedbackTts = null;
@@ -22,9 +24,9 @@ public Feedback(SharedPreferences prefs, Context ctx) {
 	public void onInit(int i) {
 		Logger.d("Feedback onInit");
 		if(errorsTts != null)
-			errorsTts.setLanguage(VoiceControlForPlexApplication.getVoiceLocale(mPrefs.getString(VoiceControlForPlexApplication.Pref.ERRORS_VOICE, "Locale.US")));
+			errorsTts.setLanguage(VoiceControlForPlexApplication.getVoiceLocale(mPrefs.getString(Preferences.ERRORS_VOICE, "Locale.US")));
 		if(feedbackTts != null)
-			feedbackTts.setLanguage(VoiceControlForPlexApplication.getVoiceLocale(mPrefs.getString(VoiceControlForPlexApplication.Pref.FEEDBACK_VOICE, "Locale.US")));
+			feedbackTts.setLanguage(VoiceControlForPlexApplication.getVoiceLocale(mPrefs.getString(Preferences.FEEDBACK_VOICE, "Locale.US")));
 
 		if(errorsQueue != null) {
 			feedback(errorsQueue, true);

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

@@ -0,0 +1,17 @@
+package com.atomjack.vcfp;
+
+import java.util.concurrent.Future;
+
+public abstract class FutureRunnable implements Runnable {
+
+	private Future<?> future;
+
+	/* Getter and Setter for future */
+	public Future getFuture() {
+		return future;
+	}
+
+	public void setFuture(Future _future) {
+		future = _future;
+	}
+}

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

@@ -10,6 +10,7 @@
 import android.widget.AdapterView;
 import android.widget.ListView;
 
+import com.atomjack.vcfp.adapters.PlexListAdapter;
 import com.atomjack.vcfp.model.MediaContainer;
 import com.atomjack.vcfp.model.PlexClient;
 import com.atomjack.vcfp.model.PlexServer;
@@ -156,7 +157,7 @@ public void onClick(DialogInterface dialog, int id) {
 				} else {
 					Logger.d("Clients: " + clients.size());
 					SharedPreferences.Editor mPrefsEditor = mPrefs.edit();
-					mPrefsEditor.putString(VoiceControlForPlexApplication.Pref.SAVED_CLIENTS, gson.toJson(clients));
+					mPrefsEditor.putString(Preferences.SAVED_CLIENTS, gson.toJson(clients));
 					mPrefsEditor.commit();
 					showPlexClients(clients);
 				}

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

@@ -0,0 +1,9 @@
+package com.atomjack.vcfp;
+
+public class PlexHeaders {
+	public static final String XPlexClientPlatform = "X-Plex-Client-Platform";
+	public static final String XPlexClientIdentifier = "X-Plex-Client-Identifier";
+	public static final String XPlexTargetClientIdentifier = "X-Plex-Target-Client-Identifier";
+	public static final String XPlexToken = "X-Plex-Token";
+	public static final String XPlexDeviceName = "X-Plex-Device-Name";
+}

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

@@ -9,6 +9,8 @@
 import android.speech.RecognizerIntent;
 import android.support.v4.content.LocalBroadcastManager;
 
+import com.atomjack.vcfp.activities.MainActivity;
+import com.atomjack.vcfp.activities.NowPlayingActivity;
 import com.atomjack.vcfp.model.MediaContainer;
 import com.atomjack.vcfp.model.PlexClient;
 import com.atomjack.vcfp.model.PlexDirectory;
@@ -745,7 +747,7 @@ private void playVideo(final PlexVideo video, String transientToken) {
 			if(transientToken != null)
 				qs.add("token", transientToken);
 			if(video.server.accessToken != null)
-				qs.add(MainActivity.PlexHeaders.XPlexToken, video.server.accessToken);
+				qs.add(PlexHeaders.XPlexToken, video.server.accessToken);
 
 			String url = String.format("http://%s:%s/player/playback/playMedia?%s", client.host, client.port, qs);
 			PlexHttpClient.get(url, new PlexHttpResponseHandler()
@@ -1345,7 +1347,7 @@ private void playTrack(final PlexTrack track, final PlexDirectory album) {
 			qs.add("containerKey", album.key);
 		if(mPrefs.getBoolean("resume", false) || resumePlayback)
 			qs.add("viewOffset", track.viewOffset);
-		qs.add(MainActivity.PlexHeaders.XPlexTargetClientIdentifier, client.machineIdentifier);
+		qs.add(PlexHeaders.XPlexTargetClientIdentifier, client.machineIdentifier);
 		String url = String.format("http://%s:%s/player/playback/playMedia?%s", client.host, client.port, qs);
 
 		PlexHttpClient.get(url, new PlexHttpResponseHandler()

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

@@ -0,0 +1,10 @@
+package com.atomjack.vcfp;
+
+public class Preferences {
+	public final static String FEEDBACK_VOICE = "pref.feedback.voice";
+	public final static String ERRORS_VOICE = "pref.errors.voice";
+	public final static String SAVED_SERVERS = "pref.saved_servers";
+	public final static String SAVED_CLIENTS = "pref.saved_clients";
+	public final static String UUID = "pref.uuid";
+	public final static String AUTHENTICATION_TOKEN = "pref.authentication_token";
+}