Version 2.0.1. Added support for displaying fan art slideshow on Chromecast. Use proper method of disconnecting from Chromecast.

Author: Chris Bellew

VoiceControlForPlex.iml

@@ -8,8 +8,6 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />

mobile/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
     package="com.atomjack.vcfp"
-    android:versionCode="38"
-    android:versionName="2.0" >
+    android:versionCode="39"
+    android:versionName="2.0.1" >
 
     <uses-permission android:name="com.mohammadag.googlesearchapi.permission.ACCESS_GGOGLE_SEARCH_API" />
     <uses-permission android:name="android.permission.INTERNET" />

mobile/src/main/java/com/atomjack/vcfp/CastPlayerManager.java

@@ -10,6 +10,7 @@
 import com.atomjack.vcfp.model.Connection;
 import com.atomjack.vcfp.model.PlexClient;
 import com.atomjack.vcfp.model.PlexMedia;
+import com.atomjack.vcfp.model.PlexServer;
 import com.atomjack.vcfp.model.PlexTrack;
 import com.atomjack.vcfp.model.PlexVideo;
 import com.google.android.gms.cast.ApplicationMetadata;
@@ -19,6 +20,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class CastPlayerManager {
   private PlexMedia nowPlayingMedia;
@@ -66,6 +68,9 @@ public static final class PARAMS {
     public static final String PLEX_USERNAME = "plexUsername";
     public static final String ACCESS_TOKEN = "accessToken";
 
+    public static final String RECEIVE_SERVERS = "receiveServers";
+    public static final String SERVERS = "servers";
+
   };
 
   private Context mContext;
@@ -98,14 +103,33 @@ public void subscribe(final PlexClient _client) {
     if(castManager.isConnected()) {
       castManager.disconnect();
     }
-    castManager.setDevice(_client.castDevice, false);
+    castManager.setDevice(_client.castDevice);
     castConsumer.setOnConnected(new Runnable() {
       @Override
       public void run() {
         mClient = _client;
 //        currentState = castManager.getPlaybackStatus();
         Logger.d("castConsumer connected to %s", mClient.name);
         getPlaybackState();
+
+        //
+        JSONObject obj = new JSONObject();
+        try {
+          obj.put(PARAMS.ACTION, PARAMS.RECEIVE_SERVERS);
+
+          PlexServer server = VoiceControlForPlexApplication.gsonRead.fromJson(VoiceControlForPlexApplication.getInstance().prefs.get(Preferences.SERVER, ""), PlexServer.class);
+          if(server.name.equals(mContext.getString(R.string.scan_all)))
+            obj.put(PARAMS.SERVERS, VoiceControlForPlexApplication.gsonWrite.toJson(VoiceControlForPlexApplication.getInstance().servers));
+          else {
+            ConcurrentHashMap<String, PlexServer> map = new ConcurrentHashMap<String, PlexServer>();
+            map.put(server.name, server);
+            obj.put(PARAMS.SERVERS, VoiceControlForPlexApplication.gsonWrite.toJson(map));
+          }
+          sendMessage(obj);
+        } catch (Exception ex) {}
+
+
+
         subscribed = true;
         if(listener != null)
           listener.onCastConnected(_client);
@@ -116,18 +140,21 @@ public void run() {
   }
 
   public boolean isSubscribed() {
+    Logger.d("[CastPlayerManager] subscribed: %s, mClient: %s", subscribed, mClient);
     return subscribed && mClient != null;
   }
 
   public void unsubscribe() {
     try {
       Logger.d("is connected: %s", castManager.isConnected());
-      if(castManager.isConnected())
-        castManager.stopApplication();
+      if(castManager.isConnected()) {
+        castManager.disconnect();
+      }
     } catch (Exception ex) {
       ex.printStackTrace();
     }
     subscribed = false;
+    mClient = null;
     if(listener != null)
       listener.onCastDisconnected();
   }
@@ -257,8 +284,8 @@ private static VideoCastManager getCastManager(Context context) {
                       VideoCastManager.FEATURE_DEBUGGING);
 
     }
-    castManager.setContext(context);
-    castManager.setStopOnDisconnect(false);
+//    castManager.setContext(context);
+    castManager.setStopOnDisconnect(true);
     return castManager;
   }
 

mobile/src/main/java/com/atomjack/vcfp/VoiceControlForPlexApplication.java

@@ -227,10 +227,12 @@ public static void addPlexServer(PlexServer addedServer, final Runnable onFinish
 		}
     PlexServer serverToAdd = null;
     // First, see if we've already found this server from a remote scan. We'll want to use that one instead so the remote connections are included
-    for(PlexServer _server : VoiceControlForPlexApplication.servers.values()) {
-      if(_server.machineIdentifier.equals(addedServer.machineIdentifier)) {
-        serverToAdd = _server;
-        break;
+    if(onFinish == null) { // onFinish is null when called from a local server scan - otherwise it's from a remote scan
+      for (PlexServer _server : VoiceControlForPlexApplication.servers.values()) {
+        if (_server.machineIdentifier.equals(addedServer.machineIdentifier)) {
+          serverToAdd = _server;
+          break;
+        }
       }
     }
     final PlexServer server = serverToAdd == null ? addedServer : serverToAdd;

mobile/src/main/java/com/atomjack/vcfp/activities/VCFPActivity.java

@@ -593,7 +593,7 @@ public void onTimelineReceived(MediaContainer mc) {
 
   @Override
   public void onUnsubscribed() {
-    Logger.d("VCFPActivity onUnsubscribed");
+    Logger.d("[VCFPActivity] onUnsubscribed");
     setCastIconInactive();
     nowPlayingMedia = null;
     VoiceControlForPlexApplication.getInstance().cancelNotification();

mobile/src/main/res/xml/changelog.xml

@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="2.0.1" versioncode="39">
+        <change>Added Android Wear Support.</change>
+        <change>Consolidated Server/Client scanning, which will run smoother.</change>
+        <change>Plex Server Connections will now expire an hour after discovery. This allows using a local server then moving to another location and accessing that server remotely (previously, you'd have to scan for servers again so that the remote connection would be used instead of local).</change>
+        <change>Support for displaying fan art slideshow on Chromecast.</change>
+        <change>Various bug fixes and enhancements.</change>
+    </release>
     <release version="2.0" versioncode="38">
         <change>Added Android Wear Support.</change>
         <change>Consolidated Server/Client scanning, which will run smoother.</change>

wear/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.atomjack.vcfp"
-    android:versionCode="38"
-    android:versionName="2.0">
+    android:versionCode="39"
+    android:versionName="2.0.1">
 
     <uses-feature android:name="android.hardware.type.watch" />
 

wear/wear.iml

@@ -81,7 +81,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />