Disabled voice feedback; Bumped version number.

Author: Chris Bellew

src/com/atomjack/vcfp/MainActivity.java

@@ -4,20 +4,15 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.simpleframework.xml.Serializer;
-import org.simpleframework.xml.core.Persister;
-
 import us.nineworlds.serenity.GDMReceiver;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.BroadcastReceiver;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
-import android.content.res.Resources.NotFoundException;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.content.LocalBroadcastManager;
@@ -47,8 +42,7 @@ public class MainActivity extends Activity {
   public final static String BUGSENSE_APIKEY = "879458d0";
 
 	private BroadcastReceiver gdmReceiver = new GDMReceiver();
-	private Activity mCurrentActivity = null;
-    
+
 	private Dialog searchDialog = null;
 	private Dialog serverSelectDialog = null;
 
@@ -57,8 +51,6 @@ public class MainActivity extends Activity {
 
   private Map<String, PlexClient> m_clients = new HashMap<String, PlexClient>();
 
-	private static Serializer serial = new Persister();
-	
 	private SharedPreferences mPrefs;
 	private SharedPreferences.Editor mPrefsEditor;
 
@@ -69,16 +61,16 @@ public class MainActivity extends Activity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
-//    BugSenseHandler.initAndStartSession(MainActivity.this, BUGSENSE_APIKEY);
+    BugSenseHandler.initAndStartSession(MainActivity.this, BUGSENSE_APIKEY);
 
 
 		mPrefs = getSharedPreferences(PREFS, MODE_PRIVATE);
 		mPrefsEditor = mPrefs.edit();
 		Gson gson = new Gson();
 
 		setContentView(R.layout.main);
-		this.server = (PlexServer)gson.fromJson(mPrefs.getString("Server", ""), PlexServer.class);
-		this.client = (PlexClient)gson.fromJson(mPrefs.getString("Client", ""), PlexClient.class);
+		this.server = gson.fromJson(mPrefs.getString("Server", ""), PlexServer.class);
+		this.client = gson.fromJson(mPrefs.getString("Client", ""), PlexClient.class);
 
 		initMainWithServer();
 	}
@@ -138,8 +130,8 @@ public void onItemClick(AdapterView<?> adapter, View view, int position,
 					searchForPlexServers();
 				} else if(holder.tag.equals("client")) {
 					getClients();
-				} else if(holder.tag.equals("feedback")) {
-					selectFeedback();
+//				} else if(holder.tag.equals("feedback")) {
+//					selectFeedback();
 				}
 			}
 		});
@@ -155,14 +147,7 @@ public void settingRowHelpButtonClicked(View v) {
 			helpDialog = new AlertDialog.Builder(MainActivity.this);
 		}
 		helpDialog.setTitle(R.string.app_name);
-		/*
-		AlertDialog.Builder alertDialog = new AlertDialog.Builder(MainActivity.this)
-		.setTitle(R.string.app_name)
-		.setMessage(R.string.about_text);
 
-		alertDialog.show();
-		*/
-		
 		if(helpButtonClicked.equals("server")) {
 			helpDialog.setMessage(R.string.help_server);
 		} else if(helpButtonClicked.equals("client")) {
@@ -265,13 +250,11 @@ public void onSuccess(MediaContainer clientMC)
         {
           serversScanned++;
           // Exclude non-Plex Home Theater clients (pre 1.0.7)
-//          List<PlexClient> clients = new ArrayList<PlexClient>();
           Logger.d("clientMC size: %d", clientMC.clients.size());
           for(int i=0;i<clientMC.clients.size();i++) {
             float version = clientMC.clients.get(i).getNumericVersion();
             Logger.d("Version: %f", version);
             if((version >= 1.07 || !clientMC.clients.get(i).getProduct().equals("Plex Home Theater")) && !m_clients.containsKey(clientMC.clients.get(i).getName())) {
-//              m_clients.add(clientMC.clients.get(i));
               m_clients.put(clientMC.clients.get(i).getName(), clientMC.clients.get(i));
             }
           }
@@ -379,19 +362,6 @@ private void scanForClients() {
 		startService(mServiceIntent);
 	}
 
-  private static MediaContainer getMediaContainer(String response) {
-    MediaContainer mediaContainer = new MediaContainer();
-
-    try {
-      mediaContainer = serial.read(MediaContainer.class, response);
-    } catch (NotFoundException e) {
-      e.printStackTrace();
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-    return mediaContainer;
-  }
-
 	private void getClients(MediaContainer mc) {
 		if(mc != null) {
 			this.server.setMachineIdentifier(mc.getMachineIdentifier());
@@ -487,23 +457,6 @@ private void saveSettings() {
 		mPrefsEditor.commit();
 	}
 
-	public void onReceive(Context context, Intent intent) {
-		String message = "Broadcast intent detected " + intent.getAction();
-		Logger.d(message);
-	}
-	
-	public void onFinishedSearch() {
-		Logger.d("done with search");
-	}
-
-	public Activity getCurrentActivity(){
-        return mCurrentActivity;
-	}
-	
-	public void setCurrentActivity(MainActivity mCurrentActivity){
-		this.mCurrentActivity = mCurrentActivity;
-	}
-  
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		// Inflate the menu; this adds items to the action bar if it is present.

src/com/atomjack/vcfp/PlayMediaActivity.java

@@ -6,9 +6,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.simpleframework.xml.Serializer;
-import org.simpleframework.xml.core.Persister;
-
 import us.nineworlds.serenity.GDMReceiver;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -45,7 +42,6 @@ public class PlayMediaActivity extends Activity {
 	private String queryText;
 	private Dialog searchDialog = null;
 	private ConcurrentHashMap<String, PlexServer> plexmediaServers = new ConcurrentHashMap<String, PlexServer>();
-	private static Serializer serial = new Persister();
 	private int serversScanned = 0;
 	private BroadcastReceiver gdmReceiver = new GDMReceiver();
 	private Intent mServiceIntent;
@@ -66,7 +62,8 @@ protected void onCreate(Bundle savedInstanceState) {
 		Logger.d("on create PlayMediaActivity");
 		super.onCreate(savedInstanceState);
 
-//    BugSenseHandler.initAndStartSession(PlayMediaActivity.this, MainActivity.BUGSENSE_APIKEY);
+
+    BugSenseHandler.initAndStartSession(PlayMediaActivity.this, MainActivity.BUGSENSE_APIKEY);
 
     mPrefs = getSharedPreferences(PREFS, MODE_PRIVATE);
 
@@ -503,7 +500,6 @@ public void onSuccess(MediaContainer mc)
               thisTrack.setAlbum(thisTrack.getParentTitle());
               Logger.d("Track: %s by %s.", thisTrack.getTitle(), thisTrack.getArtist());
               if(compareTitle(thisTrack.getArtist(), artist)) {
-//              if(thisTrack.getArtist().toLowerCase().equals(artist.toLowerCase())) {
                 thisTrack.setServer(server);
                 tracks.add(thisTrack);
               }
@@ -972,15 +968,11 @@ private void onMovieSearchFinished(String queryTerm) {
 			return;
 		}
 	}
-	
-	private void feedback(String text) {
-//		if(mPrefs.getInt("feedback", MainActivity.FEEDBACK_VOICE) == MainActivity.FEEDBACK_VOICE) {
-//			GoogleSearchApi.speak(this, text);
-//		} else {
+
+  private void feedback(String text) {
     Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
-//		}
-		Logger.d(text);
-	}
+    Logger.d(text);
+  }
 
   private void playAlbum(final PlexDirectory album) {
     String url = "http://" + album.server.getAddress() + ":" + album.server.getPort() + album.key;