Renamed PlexSearch service; Use password type for password entry field; Need to dispose of TextToSpeech object when activity finishes.

Author: Chris Bellew

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

@@ -25,7 +25,7 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager,int[] ap
 			RemoteViews remoteViews = new RemoteViews(context.getPackageName(),
 							R.layout.widget_layout);
 
-			Intent serviceIntent = new Intent(context, PlexSearch.class);
+			Intent serviceIntent = new Intent(context, PlexSearchService.class);
 			SecureRandom random = new SecureRandom();
 			serviceIntent.setData(Uri.parse(new BigInteger(130, random).toString(32)));
 			PendingIntent resultsPendingIntent = PendingIntent.getService(context, 0, serviceIntent, Intent.FLAG_ACTIVITY_NEW_TASK);

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

@@ -90,6 +90,8 @@ public static final class PlexHeaders {
 
 	private Gson gson = new Gson();
 
+	private TextToSpeech tts;
+
 	Menu menu;
 
 	private boolean loggedIn = false;
@@ -133,11 +135,6 @@ public void onDeviceSelected(PlexDevice device) {
 				else if(device instanceof PlexClient)
 					setClient((PlexClient)device);
 			}
-
-			@Override
-			public void onFinishedScan() {
-
-			}
 		});
 		remoteScan = new RemoteScan(mPrefs);
 
@@ -169,16 +166,6 @@ private void openAppInPlayStore(String packageName) {
 		}
 	}
 
-	private boolean hasValidGoogleSearch() {
-		try
-		{
-			PackageInfo pinfo = getPackageManager().getPackageInfo("com.google.android.googlequicksearchbox", 0);
-			if(VoiceControlForPlexApplication.isVersionLessThan(pinfo.versionName, "3.4"))
-				return true;
-		} catch(Exception e) {}
-		return false;
-	}
-
 	private boolean hasValidTasker() {
 		PackageInfo pinfo;
 		try
@@ -235,7 +222,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
 				// success, create the TTS instance
 				availableVoices = data.getStringArrayListExtra(TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES);
 				// Need this or else voice selection won't show up:
-				TextToSpeech tts = new TextToSpeech(this, this);
+				tts = new TextToSpeech(this, this);
 			} else {
 				// missing data, install it
 				Intent installIntent = new Intent();
@@ -370,7 +357,7 @@ public void onClick(DialogInterface dialog, int id) {
 				mPrefsEditor.commit();
 				Intent checkIntent = new Intent();
 				checkIntent.setAction(TextToSpeech.Engine.ACTION_CHECK_TTS_DATA);
-				final TextToSpeech tts = new TextToSpeech(ctx, new TextToSpeech.OnInitListener() {
+				tts = new TextToSpeech(ctx, new TextToSpeech.OnInitListener() {
 					@Override
 					public void onInit(int i) {
 
@@ -710,6 +697,8 @@ protected void onDestroy() {
 			LocalBroadcastManager.getInstance(this).unregisterReceiver(gdmReceiver);
 		}
 		feedback.destroy();
+		if(tts != null)
+			tts.shutdown();
 		super.onDestroy();
 	}
 

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

@@ -18,7 +18,7 @@ public void onReceive(final Context context, final Intent intent)
 
 		if(queryText != null && queryText.matches(context.getResources().getString(R.string.pattern_recognition))) {
 			queryText = queryText.toLowerCase();
-			Intent sendIntent = new Intent(context, PlexSearch.class);
+			Intent sendIntent = new Intent(context, PlexSearchService.class);
 			sendIntent.setAction("com.atomjack.vcfp.intent.ACTION_SEARCH");
 			sendIntent.putExtra("queryText", queryText);
 			sendIntent.putExtra("ORIGIN", "Tasker");

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

@@ -31,7 +31,7 @@
 
 import us.nineworlds.serenity.GDMReceiver;
 
-public class PlexSearch extends Service {
+public class PlexSearchService extends Service {
 
 	public final static String PREFS = MainActivity.PREFS;
 	private SharedPreferences mPrefs;
@@ -70,7 +70,7 @@ private interface AfterTransientTokenRequest {
 	public int onStartCommand(Intent intent, int flags, int startId) {
 		Logger.d("PlexSearch: onStartCommand");
 
-		BugSenseHandler.initAndStartSession(PlexSearch.this, MainActivity.BUGSENSE_APIKEY);
+		BugSenseHandler.initAndStartSession(PlexSearchService.this, MainActivity.BUGSENSE_APIKEY);
 
 		videoPlayed = false;
 
@@ -200,7 +200,7 @@ private void startup() {
 				mServiceIntent = new Intent(this, GDMService.class);
 			}
 			mServiceIntent.setAction(VoiceControlForPlexApplication.Intent.GDMRECEIVE);
-			mServiceIntent.putExtra("class", PlexSearch.class);
+			mServiceIntent.putExtra("class", PlexSearchService.class);
 			mServiceIntent.putExtra("ORIGIN", "PlexSearch");
 			startService(mServiceIntent);
 			feedback.m("Scanning for Plex Servers");

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

@@ -14,7 +14,7 @@ public class ShortcutActivity extends Activity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		Intent serviceIntent = new Intent(getApplicationContext(), PlexSearch.class);
+		Intent serviceIntent = new Intent(getApplicationContext(), PlexSearchService.class);
 
 		serviceIntent.putExtra(VoiceControlForPlexApplication.Intent.EXTRA_SERVER, getIntent().getStringExtra(VoiceControlForPlexApplication.Intent.EXTRA_SERVER));
 		serviceIntent.putExtra(VoiceControlForPlexApplication.Intent.EXTRA_CLIENT, getIntent().getStringExtra(VoiceControlForPlexApplication.Intent.EXTRA_CLIENT));

Voice Control For Plex/src/main/res/layout/login.xml

@@ -14,7 +14,7 @@
     <EditText
         android:id="@+id/passwordInput"
         android:layout_width="match_parent"
-        android:inputType="text"
+        android:inputType="textPassword"
         android:text=""
         android:hint="@string/password"
         android:layout_height="wrap_content" />