[Chromecast] Fixed crash when using a shortcut with a Chromecast specified as the client. Fixed pause button. Fixed bug that caused client selector to show up again after a client is selected before the client scan is done.

Author: Chris Bellew

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

@@ -16,6 +16,7 @@
 import com.atomjack.vcfp.Preferences;
 import com.atomjack.vcfp.R;
 import com.atomjack.vcfp.ScanHandler;
+import com.atomjack.vcfp.UriDeserializer;
 import com.atomjack.vcfp.UriSerializer;
 import com.atomjack.vcfp.VoiceControlForPlexApplication;
 import com.atomjack.vcfp.model.PlexClient;
@@ -34,11 +35,12 @@
 public class ShortcutProviderActivity extends Activity {
 	private LocalScan localScan;
 
-	private Gson gson = new Gson();
 	private Gson gsonWrite = new GsonBuilder()
 					.registerTypeAdapter(Uri.class, new UriSerializer())
 					.create();
-
+	private Gson gsonRead = new GsonBuilder()
+					.registerTypeAdapter(Uri.class, new UriDeserializer())
+					.create();
 	private BroadcastReceiver gdmReceiver = new GDMReceiver();
 
 	private PlexServer server;
@@ -71,8 +73,8 @@ public void onDeviceSelected(PlexDevice device, boolean _resume) {
 
 		Type serverType = new TypeToken<ConcurrentHashMap<String, PlexServer>>(){}.getType();
 		Type clientType = new TypeToken<HashMap<String, PlexClient>>(){}.getType();
-		servers = gson.fromJson(VoiceControlForPlexApplication.getInstance().prefs.get(Preferences.SAVED_SERVERS, ""), serverType);
-		clients = gson.fromJson(VoiceControlForPlexApplication.getInstance().prefs.get(Preferences.SAVED_CLIENTS, ""), clientType);
+		servers = gsonRead.fromJson(VoiceControlForPlexApplication.getInstance().prefs.get(Preferences.SAVED_SERVERS, ""), serverType);
+		clients = gsonRead.fromJson(VoiceControlForPlexApplication.getInstance().prefs.get(Preferences.SAVED_CLIENTS, ""), clientType);
 
 		Logger.d("server: %s", servers);
 		boolean didScan = false;

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

@@ -388,9 +388,10 @@ protected void onResume() {
   public void onSubscribed(PlexClient _client) {
     Logger.d("VCFPActivity: onSubscribed: %s", _client);
     mClient = _client;
+
+		subscribing = false;
     try {
       setCastIconActive();
-      subscribing = false;
     } catch (Exception e) {
       e.printStackTrace();
     }

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

@@ -151,27 +151,30 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 		Logger.d("action: %s", intent.getAction());
 		Logger.d("scan type: %s", intent.getStringExtra(VoiceControlForPlexApplication.Intent.SCAN_TYPE));
 		if(intent.getAction() != null && intent.getAction().equals(VoiceControlForPlexApplication.Intent.GDMRECEIVE)) {
-			if(intent.getStringExtra(VoiceControlForPlexApplication.Intent.SCAN_TYPE).equals(VoiceControlForPlexApplication.Intent.SCAN_TYPE_SERVER)) {
-				// We just scanned for servers and are returning from that, so set the servers we found
-				// and then figure out which mClient to play to
-				Logger.d("Got back from scanning for servers.");
-				videoPlayed = false;
-				plexmediaServers = VoiceControlForPlexApplication.servers;
-				didServerScan = true;
-				setClient();
-			} else if(intent.getStringExtra(VoiceControlForPlexApplication.Intent.SCAN_TYPE).equals(VoiceControlForPlexApplication.Intent.SCAN_TYPE_CLIENT)) {
-				// Got back from mClient scan, so set didClientScan to true so we don't do this again, and save the clients we got, then continue
-				didClientScan = true;
-				ArrayList<PlexClient> cs = intent.getParcelableArrayListExtra(VoiceControlForPlexApplication.Intent.EXTRA_CLIENTS);
-        if(cs != null) {
-          VoiceControlForPlexApplication.clients = new HashMap<String, PlexClient>();
-          for (PlexClient c : cs) {
-            VoiceControlForPlexApplication.clients.put(c.name, c);
-          }
-          clients = (HashMap) VoiceControlForPlexApplication.clients;
-          clients.putAll(VoiceControlForPlexApplication.castClients);
-        }
-				startup();
+			Class receivedClass = (Class)intent.getSerializableExtra(VoiceControlForPlexApplication.Intent.EXTRA_CLASS);
+			if(receivedClass == PlexSearchService.class) {
+				if (intent.getStringExtra(VoiceControlForPlexApplication.Intent.SCAN_TYPE).equals(VoiceControlForPlexApplication.Intent.SCAN_TYPE_SERVER)) {
+					// We just scanned for servers and are returning from that, so set the servers we found
+					// and then figure out which mClient to play to
+					Logger.d("Got back from scanning for servers.");
+					videoPlayed = false;
+					plexmediaServers = VoiceControlForPlexApplication.servers;
+					didServerScan = true;
+					setClient();
+				} else if (intent.getStringExtra(VoiceControlForPlexApplication.Intent.SCAN_TYPE).equals(VoiceControlForPlexApplication.Intent.SCAN_TYPE_CLIENT)) {
+					// Got back from mClient scan, so set didClientScan to true so we don't do this again, and save the clients we got, then continue
+					didClientScan = true;
+					ArrayList<PlexClient> cs = intent.getParcelableArrayListExtra(VoiceControlForPlexApplication.Intent.EXTRA_CLIENTS);
+					if (cs != null) {
+						VoiceControlForPlexApplication.clients = new HashMap<String, PlexClient>();
+						for (PlexClient c : cs) {
+							VoiceControlForPlexApplication.clients.put(c.name, c);
+						}
+						clients = (HashMap) VoiceControlForPlexApplication.clients;
+						clients.putAll(VoiceControlForPlexApplication.castClients);
+					}
+					startup();
+				}
 			}
 		} else {
 			queryText = null;

Voice Control For Plex/src/main/res/drawable-hdpi/button_pause.png

@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="1.9.2" versioncode="28">
+        <change>[Chromecast] Fixed rewind/fast forward buttons.</change>
+        <change>[Chromecast] Fixed crash when using a shortcut with a Chromecast specified as the client.</change>
+        <change>Bug fixes.</change>
+    </release>
     <release version="1.9.0" versioncode="26">
         <change>Added Chromecast support.</change>
         <change>Updated now playing screen to be a full fledged remote control.</change>