[Chromecast] Fixed crash when using a shortcut which has a Chromecast specified as the client.

Author: Chris Bellew

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

@@ -6,6 +6,7 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.content.LocalBroadcastManager;
 
@@ -15,11 +16,13 @@
 import com.atomjack.vcfp.Preferences;
 import com.atomjack.vcfp.R;
 import com.atomjack.vcfp.ScanHandler;
+import com.atomjack.vcfp.UriSerializer;
 import com.atomjack.vcfp.VoiceControlForPlexApplication;
 import com.atomjack.vcfp.model.PlexClient;
 import com.atomjack.vcfp.model.PlexDevice;
 import com.atomjack.vcfp.model.PlexServer;
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 
 import java.lang.reflect.Type;
@@ -32,6 +35,9 @@ 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 BroadcastReceiver gdmReceiver = new GDMReceiver();
 
@@ -107,9 +113,9 @@ private void createShortcut(boolean use_current) {
 
 		Intent launchIntent = new Intent(this, ShortcutActivity.class);
 		if(!use_current) {
-			Logger.d("setting mClient to %s", client.name);
-			launchIntent.putExtra(VoiceControlForPlexApplication.Intent.EXTRA_SERVER, gson.toJson(server));
-			launchIntent.putExtra(VoiceControlForPlexApplication.Intent.EXTRA_CLIENT, gson.toJson(client));
+			Logger.d("setting client to %s", client.name);
+			launchIntent.putExtra(VoiceControlForPlexApplication.Intent.EXTRA_SERVER, gsonWrite.toJson(server));
+			launchIntent.putExtra(VoiceControlForPlexApplication.Intent.EXTRA_CLIENT, gsonWrite.toJson(client));
 			launchIntent.putExtra(VoiceControlForPlexApplication.Intent.EXTRA_RESUME, resume);
 			String label = server.name.equals(client.name) ? server.name : (server.owned ? server.name : server.sourceTitle) + "/" + client.name;
 			sendIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, label);

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

@@ -146,12 +146,6 @@ public int onStartCommand(Intent intent, int flags, int startId) {
       Logger.d("CAST MANAGER IS SUBSCRIBED");
     }
 
-    // TODO: Detect network connection here
-//		if(!VoiceControlForPlexApplication.isWifiConnected(this)) {
-//			feedback.e(getResources().getString(R.string.no_wifi_connection_message));
-//			return Service.START_NOT_STICKY;
-//		}
-
     currentNetworkState = VCFPActivity.NetworkState.getCurrentNetworkState(this);
 
 		Logger.d("action: %s", intent.getAction());