Disabled voice feedback; Bumped version number.

Author: Chris Bellew

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="4"
-    android:versionName="1.4" >
+    android:versionCode="5"
+    android:versionName="1.5" >
 
     <uses-permission android:name="com.mohammadag.googlesearchapi.permission.ACCESS_GGOGLE_SEARCH_API" />
     <uses-permission android:name="android.permission.INTERNET" />

src/com/atomjack/vcfp/MainActivity.java

@@ -119,7 +119,7 @@ private void initMainWithServer() {
 		MainSetting setting_data[] = new MainSetting[] {
 			new MainSetting("server", getResources().getString(R.string.stream_video_from_server), this.server != null ? this.server.getName() : getResources().getString(R.string.scan_all)),
 			new MainSetting("client", getResources().getString(R.string.to_the_client), this.client != null ? this.client.getName() : getResources().getString(R.string.not_set)),
-			new MainSetting("feedback", getResources().getString(R.string.feedback), mPrefs.getInt("feedback", 0) == FEEDBACK_VOICE ? getResources().getString(R.string.voice) : getResources().getString(R.string.toast))
+//			new MainSetting("feedback", getResources().getString(R.string.feedback), mPrefs.getInt("feedback", 0) == FEEDBACK_VOICE ? getResources().getString(R.string.voice) : getResources().getString(R.string.toast))
 		};
 
 		MainListAdapter adapter = new MainListAdapter(this, R.layout.main_setting_item_row, setting_data);

src/com/atomjack/vcfp/PlayMediaActivity.java

@@ -798,8 +798,10 @@ public void onSuccess(MediaContainer mc)
         PlexVideo latestVideo = null;
         for(int j=0;j<mc.videos.size();j++) {
           PlexVideo video = mc.videos.get(j);
-          if(latestVideo == null || latestVideo.airDate().before(video.airDate()))
+          if(latestVideo == null || latestVideo.airDate().before(video.airDate())) {
+            video.setShowTitle(video.getGrandparentTitle());
             latestVideo = video;
+          }
         }
         latestVideo.setServer(show.server);
         Logger.d("Found video: %s", latestVideo.airDate());
@@ -952,6 +954,7 @@ private void onMovieSearchFinished(String queryTerm) {
         if(videos.get(i).getTitle().toLowerCase().equals(queryTerm.toLowerCase())) {
           exactMatch = true;
           playVideo(videos.get(i));
+          feedback("Now watching " + videos.get(i).getTitle() + " on " + client.getName());
           break;
         }
       }
@@ -971,19 +974,16 @@ private void onMovieSearchFinished(String queryTerm) {
 	}
 
 	private void feedback(String text) {
-		if(mPrefs.getInt("feedback", MainActivity.FEEDBACK_VOICE) == MainActivity.FEEDBACK_VOICE) {
-			GoogleSearchApi.speak(this, text);
-		} else {
-			Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
-		}
+//		if(mPrefs.getInt("feedback", MainActivity.FEEDBACK_VOICE) == MainActivity.FEEDBACK_VOICE) {
+//			GoogleSearchApi.speak(this, text);
+//		} else {
+    Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
+//		}
 		Logger.d(text);
 	}
 
   private void playAlbum(final PlexDirectory album) {
     String url = "http://" + album.server.getAddress() + ":" + album.server.getPort() + album.key;
-//    if(mPrefs.getBoolean("resume", false) || resumePlayback) {
-//      url += "&viewOffset=" + track.getViewOffset();
-//    }
     PlexHttpClient.get(url, null, new PlexHttpMediaContainerHandler()
     {
       @Override