Fixed control of Plex clients through Wear and Notifications.

Author: Chris Bellew

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

@@ -7,12 +7,10 @@
 import com.atomjack.shared.PlayerState;
 import com.atomjack.shared.model.Timeline;
 import com.atomjack.vcfp.activities.VCFPActivity;
-import com.atomjack.vcfp.interfaces.PlayerStateHandler;
 import com.atomjack.vcfp.model.MediaContainer;
 import com.atomjack.vcfp.model.PlexClient;
 import com.atomjack.vcfp.model.PlexResponse;
 import com.atomjack.vcfp.net.PlexHttpClient;
-import com.atomjack.vcfp.net.PlexHttpMediaContainerHandler;
 import com.atomjack.vcfp.net.PlexHttpResponseHandler;
 
 import org.apache.http.Header;
@@ -72,6 +70,9 @@ public class PlexSubscription {
 
   private Handler mHandler;
 
+  private PlayerState currentState;
+  private Timeline currentTimeline;
+
   public PlexSubscription() {
     mHandler = new Handler();
     uuid = VoiceControlForPlexApplication.getInstance().prefs.getUUID();
@@ -188,6 +189,11 @@ public void run() {
             e.printStackTrace();
           }
 
+          currentTimeline = mediaContainer.getActiveTimeline();
+          if(currentTimeline != null) {
+            currentState = PlayerState.getState(currentTimeline);
+          }
+
           onMessage(mediaContainer);
 
 
@@ -434,31 +440,11 @@ public PlexClient getClient() {
     return mClient;
   }
 
-  public Timeline getCurrentTimeline() {
-    Header[] headers = {
-            new BasicHeader(PlexHeaders.XPlexClientIdentifier, VoiceControlForPlexApplication.getInstance().prefs.getUUID())
-    };
-    MediaContainer mc = PlexHttpClient.getSync(String.format("http://%s:%s/player/timeline/poll?commandID=0", mClient.address, mClient.port), headers);
-    Timeline t = mc.getActiveTimeline();
-    return t;
-//    PlayerState currentState = PlayerState.getState(t);
-
-
-    /*
-    PlexHttpClient.get(String.format("http://%s:%s/player/timeline/poll?commandID=%d", mClient.address, mClient.port, commandId), headers, new PlexHttpMediaContainerHandler() {
-      @Override
-      public void onSuccess(MediaContainer mediaContainer) {
-        Timeline t = mediaContainer.getActiveTimeline();
-        if(playerStateHandler != null)
-            playerStateHandler.onSuccess(PlayerState.getState(t));
-          commandId++;
-      }
+  public PlayerState getCurrentState() {
+    return currentState;
+  }
 
-      @Override
-      public void onFailure(Throwable error) {
-        commandId++;
-      }
-    });
-*/
+  public Timeline getCurrentTimeline() {
+    return currentTimeline;
   }
 }

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

@@ -14,7 +14,6 @@
 import com.atomjack.shared.Logger;
 import com.atomjack.vcfp.R;
 import com.atomjack.vcfp.VoiceControlForPlexApplication;
-import com.atomjack.vcfp.interfaces.PlayerStateHandler;
 import com.atomjack.vcfp.model.PlexClient;
 import com.atomjack.vcfp.model.PlexResponse;
 import com.atomjack.shared.model.Timeline;
@@ -24,20 +23,13 @@
 
 import org.codechimp.apprater.AppRater;
 
-import java.util.Hashtable;
-
 public class NowPlayingActivity extends PlayerActivity {
 	private boolean subscribed = false;
 
 	PlayerState state = PlayerState.STOPPED;
-//	enum PlayerState {
-//		PLAYING,
-//		STOPPED,
-//		PAUSED
-//	};
 
 	protected void onCreate(Bundle savedInstanceState) {
-		Logger.d("on create NowPlayingActivity");
+		Logger.d("[NowPlayingActivity] onCreate");
 		super.onCreate(savedInstanceState);
 
     plexSubscription.setListener(this);
@@ -63,19 +55,27 @@ protected void onCreate(Bundle savedInstanceState) {
 		if(mClient == null || nowPlayingMedia == null)
 			finish();
 
-
-    Logger.d("mClient: %s", mClient);
-    Logger.d("nowPlayingMedia: %s", nowPlayingMedia);
-		state = PlayerState.PLAYING;
-		showNowPlaying();
-		seekBar = (SeekBar)findViewById(R.id.seekBar);
-    seekBar.setOnSeekBarChangeListener(this);
-    seekBar.setMax(nowPlayingMedia.duration);
-    seekBar.setProgress(Integer.parseInt(nowPlayingMedia.viewOffset));
-
-		setCurrentTimeDisplay(getOffset(nowPlayingMedia));
-		durationDisplay.setText(VoiceControlForPlexApplication.secondsToTimecode(nowPlayingMedia.duration / 1000));
-
+    if(plexSubscription.isSubscribed()) {
+        state = plexSubscription.getCurrentState();
+        if(state == PlayerState.STOPPED) {
+          VoiceControlForPlexApplication.getInstance().cancelNotification();
+          finish();
+        } else {
+          Logger.d("mClient: %s", mClient);
+          Logger.d("nowPlayingMedia: %s", nowPlayingMedia);
+          showNowPlaying();
+          seekBar = (SeekBar) findViewById(R.id.seekBar);
+          seekBar.setOnSeekBarChangeListener(NowPlayingActivity.this);
+          seekBar.setMax(nowPlayingMedia.duration);
+          seekBar.setProgress(Integer.parseInt(nowPlayingMedia.viewOffset));
+
+          setCurrentTimeDisplay(getOffset(nowPlayingMedia));
+          durationDisplay.setText(VoiceControlForPlexApplication.secondsToTimecode(nowPlayingMedia.duration / 1000));
+        }
+    } else {
+      VoiceControlForPlexApplication.getInstance().cancelNotification();
+      finish();
+    }
 
 	}
 

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

@@ -40,7 +40,6 @@
 import com.atomjack.shared.Preferences;
 import com.atomjack.vcfp.R;
 import com.atomjack.vcfp.interfaces.BitmapHandler;
-import com.atomjack.vcfp.interfaces.PlayerStateHandler;
 import com.atomjack.vcfp.interfaces.ScanHandler;
 import com.atomjack.vcfp.interfaces.ServerFindHandler;
 import com.atomjack.shared.UriDeserializer;
@@ -58,7 +57,6 @@
 import com.atomjack.vcfp.net.PlexHttpClient;
 import com.atomjack.vcfp.net.PlexHttpMediaContainerHandler;
 import com.atomjack.vcfp.services.PlexScannerService;
-import com.atomjack.vcfp.services.WearListenerService;
 import com.bugsense.trace.BugSenseHandler;
 import com.google.android.gms.wearable.DataMap;
 import com.google.gson.Gson;

mobile/src/main/java/com/atomjack/vcfp/interfaces/PlayerStateHandler.java

@@ -107,6 +107,16 @@ private void adjustPlayback(String which, PlexHttpResponseHandler responseHandle
 		}
 	}
 
+  private PlexResponse adjustPlayback(String which) {
+    try {
+      String url = String.format("http://%s:%s/player/playback/%s", address, port, which);
+      return PlexHttpClient.getSync(url);
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    return null;
+  }
+
   public PlexResponse pause() {
     return adjustPlayback("pause");
   }
@@ -124,17 +134,6 @@ public PlexResponse seekTo(int offset) {
     return PlexHttpClient.getSync(url);
   }
 
-  private PlexResponse adjustPlayback(String which) {
-    try {
-      String url = String.format("http://%s:%s/player/playback/%s", address, port, which);
-      PlexResponse r = PlexHttpClient.getSync(url);
-      return r;
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-    return null;
-  }
-
   public boolean isLocalDevice() {
     String localip = Utils.getIPAddress(true);
     return localip.equals(address);

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

@@ -50,14 +50,14 @@ public void onHandleIntent(final Intent intent) {
     if(intent.getAction() != null) {
       client = intent.getParcelableExtra(CLIENT);
       PlexMedia playingMedia = intent.getParcelableExtra(MEDIA);
-      PlayerState currentState = PlayerState.STOPPED;
+      PlayerState currentState;
       Timeline t = null;
 
       if(client.isCastClient) {
         currentState = castPlayerManager.getCurrentState();
       } else {
         t = plexSubscription.getCurrentTimeline();
-        currentState = PlayerState.getState(t);
+        currentState = plexSubscription.getCurrentState();
       }
 
       PlexResponse response;

mobile/src/main/java/com/atomjack/vcfp/services/PlexControlService.java

@@ -135,12 +135,7 @@ public void onMessageReceived(MessageEvent messageEvent) {
         if (plexSubscription.isSubscribed()) {
 //          PlexClient client = plexSubscription.mClient;
 
-          Header[] headers = {
-                  new BasicHeader(PlexHeaders.XPlexClientIdentifier, VoiceControlForPlexApplication.getInstance().prefs.getUUID())
-          };
-          MediaContainer mc = PlexHttpClient.getSync(String.format("http://%s:%s/player/timeline/poll?commandID=0", client.address, client.port), headers);
-          Timeline t = mc.getActiveTimeline();
-          PlayerState currentState = PlayerState.getState(t);
+          PlayerState currentState = plexSubscription.getCurrentState();
           Logger.d("[WearListenerService] current State: %s", currentState);