Filter out some extraneous stuff from error messages. Fixed bug that crashed when no network connection exists.

Author: Chris Bellew

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

@@ -103,16 +103,16 @@ private void feedback(String text, boolean errors, boolean forceToast) {
 				// The text will be spoken when the tts is finished setting up (in onInit)
 				if (errors) {
 					errorsTts = new TextToSpeech(context, this);
-					errorsQueue = text;
+					errorsQueue = filterText(text);
           errorsTts.setOnUtteranceProgressListener(utteranceProgressListener);
 				} else {
 					feedbackTts = new TextToSpeech(context, this);
-					feedbackQueue = text;
+					feedbackQueue = filterText(text);
           feedbackTts.setOnUtteranceProgressListener(utteranceProgressListener);
 				}
 			} else {
         map.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, Integer.toString(utteranceId++));
-				tts.speak(text, TextToSpeech.QUEUE_FLUSH, map);
+				tts.speak(filterText(text), TextToSpeech.QUEUE_FLUSH, map);
 				if (errors)
 					errorsQueue = null;
 				else
@@ -126,6 +126,12 @@ private void feedback(String text, boolean errors, boolean forceToast) {
 		}
 	}
 
+  // Filter out some extraneous patterns, like when a connection is refused, strip out the uri.
+  private String filterText(String text) {
+    text = text.replaceAll("to https?://([0-9]+\\.){3}[0-9]+:[0-9]+ refused", " refused");
+    return text;
+  }
+
   private UtteranceProgressListener utteranceProgressListener = new UtteranceProgressListener() {
     @Override
     public void onStart(String s) {

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

@@ -239,17 +239,19 @@ public void doPlayPause(View v) {
 	public void doRewind(View v) {
     if(position > -1) {
       nowPlayingMedia.viewOffset = Integer.toString(position - 15000);
-      if(Integer.parseInt(nowPlayingMedia.viewOffset) < 0) {
+      if (Integer.parseInt(nowPlayingMedia.viewOffset) < 0) {
         position = 0;
         nowPlayingMedia.viewOffset = "0";
       }
       castPlayerManager.seekTo(Integer.parseInt(nowPlayingMedia.viewOffset) / 1000);
+    }
 	}
 
 	public void doForward(View v) {
     if(position > -1) {
       nowPlayingMedia.viewOffset = Integer.toString(position + 30000);
       castPlayerManager.seekTo(Integer.parseInt(nowPlayingMedia.viewOffset) / 1000);
+    }
 	}
 
 	public void doStop(View v) {

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

@@ -107,17 +107,17 @@ public enum NetworkState {
     MOBILE;
 
     public static NetworkState getCurrentNetworkState(Context context) {
-      NetworkState currentNetworkState;
+      NetworkState currentNetworkState = NetworkState.DISCONNECTED;
       ConnectivityManager cm =
               (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
 
       NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
-      if(activeNetwork.getType() == ConnectivityManager.TYPE_MOBILE)
-        currentNetworkState = NetworkState.MOBILE;
-      else if(activeNetwork.getType() == ConnectivityManager.TYPE_WIFI)
-        currentNetworkState = NetworkState.WIFI;
-      else
-        currentNetworkState = NetworkState.DISCONNECTED;
+      if(activeNetwork != null) {
+        if (activeNetwork.getType() == ConnectivityManager.TYPE_MOBILE)
+          currentNetworkState = NetworkState.MOBILE;
+        else if (activeNetwork.getType() == ConnectivityManager.TYPE_WIFI)
+          currentNetworkState = NetworkState.WIFI;
+      }
       return currentNetworkState;
     }
   };