Finish service if we didn't understand the query; Show some feedback when searching for stuff; Fixed some unchecked operations.

Author: Chris Bellew

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

@@ -108,8 +108,10 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 						break;
 					}
 				}
-				if(queryText == null)
+				if(queryText == null) {
 					feedback.e(getResources().getString(R.string.didnt_understand_that));
+					return Service.START_NOT_STICKY;
+				}
 			} else {
 				// Received spoken query from Google Search API
 				Logger.d("Google Search API query");
@@ -186,7 +188,7 @@ private void startup() {
 			Logger.d("Scan all was chosen");
 
 			// First, see if what needs to be done actually needs to know about the server (i.e. pause/stop/resume playback of offset).
-			// If it does, execute the action and return as we don't need to do anything else. However, also check to see if the user
+			// If it doesn't, execute the action and return as we don't need to do anything else. However, also check to see if the user
 			// has specified a client (using " on <client name>") - if this is the case, we will need to find that client via server
 			// discovery
 			myRunnable actionToDo = handleVoiceSearch(true);
@@ -604,6 +606,7 @@ public void onFailure(Throwable error) {
 
 	private void doMovieSearch(final String queryTerm) {
 		Logger.d("Doing movie search. %d servers", plexmediaServers.size());
+		feedback.m(getString(R.string.searching_for), queryTerm);
 		serversSearched = 0;
 		for(final PlexServer server : plexmediaServers.values()) {
 			server.movieSectionsSearched = 0;
@@ -787,6 +790,7 @@ private void showPlayingVideo(PlexVideo video) {
 	}
 
 	private void doNextEpisodeSearch(final String queryTerm, final boolean fallback) {
+		feedback.m(getString(R.string.searching_for), queryTerm);
 		serversSearched = 0;
 		for(final PlexServer server : plexmediaServers.values()) {
 			server.showSectionsSearched = 0;
@@ -866,6 +870,7 @@ private void onFinishedNextEpisodeSearch(String queryTerm, boolean fallback) {
 	}
 
 	private void doLatestEpisodeSearch(final String queryTerm) {
+		feedback.m(getString(R.string.searching_for), queryTerm);
 		Logger.d("doLatestEpisodeSearch: %s", queryTerm);
 		serversSearched = 0;
 		for(final PlexServer server : plexmediaServers.values()) {
@@ -968,6 +973,7 @@ public void onFailure(Throwable error) {
 	}
 
 	private void doShowSearch(String episodeSpecified, final String showSpecified) {
+		feedback.m(getString(R.string.searching_for_episode), showSpecified, episodeSpecified);
 		serversSearched = 0;
 		for(final PlexServer server : plexmediaServers.values()) {
 			server.showSectionsSearched = 0;
@@ -1038,6 +1044,7 @@ private void playSpecificEpisode(String showSpecified) {
 	}
 
 	private void doShowSearch(final String queryTerm, final String season, final String episode) {
+		feedback.m(getString(R.string.searching_for_show_season_episode), queryTerm, season, episode);
 		Logger.d("doShowSearch: %s s%s e%s", queryTerm, season, episode);
 		serversSearched = 0;
 		for(final PlexServer server : plexmediaServers.values()) {
@@ -1160,6 +1167,7 @@ public void onFailure(Throwable error) {
 	}
 
 	private void searchForAlbum(final String artist, final String album) {
+		feedback.m(getString(R.string.searching_for_album), album, artist);
 		Logger.d("Searching for album %s by %s.", album, artist);
 		serversSearched = 0;
 		Logger.d("Servers: %d", plexmediaServers.size());
@@ -1231,6 +1239,7 @@ public void onFailure(Throwable error) {
 
 	private void searchForSong(final String artist, final String track) {
 		serversSearched = 0;
+		feedback.m(getString(R.string.searching_for_album), track, artist);
 		Logger.d("Servers: %d", plexmediaServers.size());
 		for(final PlexServer server : plexmediaServers.values()) {
 			server.musicSectionsSearched = 0;

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

@@ -9,7 +9,6 @@
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-import java.util.Vector;
 
 @Root(strict=false)
 public class Device {
@@ -29,7 +28,7 @@ public class Device {
 	@ElementList(required=false, inline=true, entry="Connection")
 	public List<Connection> connections = new ArrayList<Connection>();
 
-	public Vector<String> provides;
+	public List<String> provides;
 	public Date lastSeenDate;
 	public boolean owned;
 
@@ -43,8 +42,9 @@ public class Device {
 	private int ownedInt;
 
 	@Commit
+	@SuppressWarnings("unused")
 	public void build() {
-		provides = new Vector(Arrays.asList(providesStr.split(",")));
+		provides = Arrays.asList(providesStr.split(","));
 		lastSeenDate = new Date(lastSeenAt*1000);
 		owned = ownedInt == 1;
 	}

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

@@ -44,7 +44,7 @@
     <string name="select_voice">Select Voice</string>
     <string name="cancel">Cancel</string>
     <string name="nothing_to_play">Sorry, I couldn\'t find anything to play.</string>
-    <string name="http_status_code_error">Sorry, but I got an error, HTTP status code: %d</string>
+    <string name="http_status_code_error">Sorry, but I got an error, HTTP status code: %s</string>
     <string name="got_error">Sorry, but I got an error: %s</string>
     <string name="client_not_found">Sorry, you didn\'t specify a client in the main settings, or I couldn\'t find it.</string>
     <string name="found_more_than_one_album">I found more than one matching album. Please specify artist.</string>
@@ -83,4 +83,8 @@
     <string name="logged_in">You are now logged in.</string>
     <string name="logged_out">You are now logged out.</string>
     <string name="sections">sections</string>
+    <string name="searching_for">Searching for %s.</string>
+    <string name="searching_for_episode">Searching for %1$s episode %2$s.</string>
+    <string name="searching_for_show_season_episode">Searching for %1$s season %2$s episode %3$s.</string>
+    <string name="searching_for_album">Searching for %1$s by %2$s.</string>
 </resources>