Fix for new version of Plex Home Theater which no longer includes state of "stopped" when no media is playing.

Author: Chris Bellew

VoiceControlForPlex.iml

@@ -7,7 +7,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <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 />

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="36"
-    android:versionName="2.0b5" >
+    android:versionCode="37"
+    android:versionName="2.0b6" >
 
     <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/activities/VCFPActivity.java

@@ -532,6 +532,8 @@ public void onTimelineReceived(MediaContainer mc) {
     if(timelines != null) {
       for (Timeline timeline : timelines) {
         if (timeline.key != null) {
+          if(timeline.state == null)
+            timeline.state = "stopped";
 //          Logger.d("[VCFPActivity] onTimelineReceived: %s", timeline.state);
 //          Logger.d("nowPlayingMedia: %s", nowPlayingMedia);
           // Get this media's info
@@ -902,7 +904,7 @@ public void sendWearPlaybackChange() {
       if(!plexSubscription.isSubscribed() && !castPlayerManager.isSubscribed()) {
         new SendToDataLayerThread(WearConstants.DISCONNECTED, this).start();
       } else {
-        Logger.d("Sending Wear Notification: %s", mCurrentState);
+        Logger.d("[VCFPActivity] Sending Wear Notification: %s", mCurrentState);
         final DataMap data = new DataMap();
         String msg = null;
         if (mCurrentState == PlayerState.PLAYING) {

mobile/src/main/java/com/atomjack/vcfp/model/Device.java

@@ -12,13 +12,13 @@
 
 @Root(strict=false)
 public class Device {
-	@Attribute
+	@Attribute(required=false)
 	public String name;
-	@Attribute
+	@Attribute(required=false)
 	public String product;
-	@Attribute
+	@Attribute(required=false)
 	public String productVersion;
-	@Attribute
+	@Attribute(required=false)
 	public String clientIdentifier;
 	@Attribute(required=false)
 	public String sourceTitle;

mobile/src/main/java/com/atomjack/vcfp/model/MediaContainer.java

@@ -65,7 +65,7 @@ public Timeline getTimeline(String type) {
 
   public Timeline getActiveTimeline() {
     for(Timeline t : timelines) {
-      if(!t.state.equals("stopped"))
+      if(t.state != null && !t.state.equals("stopped"))
         return t;
     }
     return null;

mobile/src/main/java/com/atomjack/vcfp/model/PlexDevice.java

@@ -8,13 +8,13 @@
 import java.util.List;
 
 public abstract class PlexDevice implements Parcelable {
-  @Attribute
+  @Attribute(required=false)
   public String name;
-  @Attribute
+  @Attribute(required=false)
 	public String address;
-  @Attribute
+  @Attribute(required=false)
 	public String port;
-  @Attribute
+  @Attribute(required=false)
 	public String version;
   @Attribute(required=false)
 	public String product;
@@ -24,7 +24,7 @@ public abstract class PlexDevice implements Parcelable {
 	public String lastSeenAt;
 	@ElementList(required=false, inline=true)
 	public List<Connection> connections;
-	@Attribute
+	@Attribute(required=false)
 	public String machineIdentifier;
 
 

mobile/src/main/java/com/atomjack/vcfp/model/PlexDirectory.java

@@ -8,9 +8,9 @@
 
 @Root(strict=false)
 public class PlexDirectory implements Parcelable {
-	@Attribute
+	@Attribute(required=false)
 	public String key;
-	@Attribute
+	@Attribute(required=false)
 	public String title;
 	@Attribute(required=false)
 	public String type;

mobile/src/main/java/com/atomjack/vcfp/model/PlexMedia.java

@@ -69,11 +69,11 @@ else if(isClip())
       return "unknown";
   }
 
-  @Attribute
+  @Attribute(required=false)
 	public String key;
-  @Attribute
+  @Attribute(required=false)
   public String ratingKey;
-	@Attribute
+	@Attribute(required=false)
 	public String title;
   @Attribute(required=false)
   public String art;

mobile/src/main/java/com/atomjack/vcfp/model/PlexUser.java

@@ -6,7 +6,7 @@
 
 @Root(strict=false)
 public class PlexUser {
-	@Attribute
+	@Attribute(required=false)
 	public String authenticationToken;
 	@Element
 	public String username;

shared/shared.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="VoiceControlForPlex" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -9,6 +9,7 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
@@ -25,6 +26,7 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />