Initial support for Plex Media Player. If we are subscribed to a Plex Client and network connectivity is lost, when it is re-acquired, if more than 30 seconds has passed since the client was last contacted, force a refresh of the subscription, in case the client booted us off for being unreachable for too long.

Author: Chris Bellew

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

@@ -421,7 +421,8 @@ public void onApplicationStatusChanged(String appStatus) {
       @Override
       public void onApplicationConnectionFailed(int errorCode) {
         Logger.d("[CastPlayerManager] onApplicationConnectionFailed: %d", errorCode);
-        listener.onCastConnectionFailed();
+        if(listener != null)
+          listener.onCastConnectionFailed();
       }
 
       @Override

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

@@ -20,38 +20,22 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
+import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketException;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class PlexSubscription {
-  public static final String ACTION_SUBSCRIBE = "com.atomjack.vcfp.action_subscribe";
-  public static final String ACTION_SUBSCRIBED = "com.atomjack.vcfp.action_subscribed";
-  public static final String ACTION_UNSUBSCRIBE = "com.atomjack.vcfp.action_unsubscribe";
-
-  // Boolean indicating whether or not to notify an activity of an action done
-  public static final String EXTRA_NOTIFY = "com.atomjack.vcfp.extra_unsubscribe_notify";
-
-  public static final String ACTION_UNSUBSCRIBED = "com.atomjack.vcfp.action_unsubscribed";
-  public static final String ACTION_BROADCAST = "com.atomjack.vcfp.action_broadcast";
-  public static final String ACTION_MESSAGE = "com.atomjack.vcfp.action_message";
-
-  public static final String EXTRA_CLASS = "com.atomjack.vcfp.extra_class";
-  public static final String EXTRA_CLIENT = "com.atomjack.vcfp.extra_client";
-  public static final String EXTRA_TIMELINES = "com.atomjack.vcfp.extra_timelines";
-
   private static final int SUBSCRIBE_INTERVAL = 30000; // Send subscribe message every 30 seconds to keep us alive
 
   private static Serializer serial = new Persister();
 
-  public PlexClient mClient; // the mClient we are subscribing to
-
-  private String uuid;
-  private String appName;
+  public PlexClient mClient; // the client we are subscribing to
 
   private VCFPActivity listener;
   private VCFPActivity notificationListener; // This will be the listener but will not be reset, and will be used for changing the notification
@@ -71,17 +55,17 @@ public class PlexSubscription {
   private PlayerState currentState = PlayerState.STOPPED;
   private Timeline currentTimeline;
 
+  public Date timeLastHeardFromClient;
+
   public PlexSubscription() {
     mHandler = new Handler();
-    uuid = VoiceControlForPlexApplication.getInstance().prefs.getUUID();
   }
 
   public void setListener(VCFPActivity _listener) {
     if(_listener != null)
       Logger.d("Setting listener to %s", _listener.getClass().getSimpleName());
     listener = _listener;
     if(_listener != null) {
-      appName = _listener.getString(R.string.app_name);
       notificationListener = _listener;
     }
   }
@@ -125,12 +109,19 @@ public void run() {
       Logger.d("starting serverthread");
       Socket socket = null;
       try {
-        serverSocket = new ServerSocket(subscriptionPort);
+        serverSocket = new ServerSocket();
+        serverSocket.setReuseAddress(true);
+        serverSocket.bind(new InetSocketAddress(subscriptionPort));
+//        subscriptionPort = serverSocket.getLocalPort();
       } catch (IOException e) {
+
         e.printStackTrace();
       }
 
       Logger.d("running");
+
+
+
       onSocketReady.run();
       if(onReady != null) {
 //        onReady.run();
@@ -258,27 +249,45 @@ public void subscribe(PlexClient client, final boolean isHeartbeat) {
     if(client == null)
       return;
     mClient = client;
-    PlexHttpClient.subscribe(client, subscriptionPort, commandId, uuid, appName, new PlexHttpResponseHandler() {
+
+    PlexHttpClient.subscribe(client, subscriptionPort, commandId, VoiceControlForPlexApplication.getInstance().getUUID(), VoiceControlForPlexApplication.getInstance().getString(R.string.app_name), new PlexHttpResponseHandler() {
       @Override
       public void onSuccess(PlexResponse response) {
         failedHeartbeats = 0;
-        Logger.d("PlexSubscription: Subscribed: %s", response.status);
-        commandId++;
-        subscribed = true;
+        if(!isHeartbeat)
+          Logger.d("PlexSubscription: Subscribed: %s", response != null ? response.status : "");
+        else
+          Logger.d("PlexSubscription: Heartbeat: %s", response != null ? response.status : "");
+
+
+
+        if(response.code != 200) {
+          this.onFailure(new Throwable(response.status));
+          // Close the server socket so it's no longer listening on the subscriptionPort
+          try {
+            serverSocket.close();
+            serverSocket = null;
+          } catch (Exception e) {}
 
-        if (!isHeartbeat) {
-          // Start the heartbeat subscription (so the server knows we're still here)
-          mHandler.removeCallbacks(subscriptionHeartbeat);
-          mHandler.postDelayed(subscriptionHeartbeat, SUBSCRIBE_INTERVAL);
-          onSubscribed();
+
+        } else {
+          timeLastHeardFromClient = new Date();
+
+          commandId++;
+          subscribed = true;
+
+          if (!isHeartbeat) {
+            // Start the heartbeat subscription (so the plex client knows we're still here)
+            mHandler.removeCallbacks(subscriptionHeartbeat);
+            mHandler.postDelayed(subscriptionHeartbeat, SUBSCRIBE_INTERVAL);
+            onSubscribed();
+          }
         }
       }
 
       @Override
       public void onFailure(final Throwable error) {
         error.printStackTrace();
-
-
         if(isHeartbeat) {
           failedHeartbeats++;
           Logger.d("%d failed heartbeats", failedHeartbeats);
@@ -352,7 +361,7 @@ public void unsubscribe(final boolean notify, final Runnable onFinish) {
     if(listener == null)
       return;
 
-    PlexHttpClient.unsubscribe(mClient, commandId, uuid, listener.getString(R.string.app_name), new PlexHttpResponseHandler() {
+    PlexHttpClient.unsubscribe(mClient, commandId, VoiceControlForPlexApplication.getInstance().prefs.getUUID(), listener.getString(R.string.app_name), new PlexHttpResponseHandler() {
       @Override
       public void onSuccess(PlexResponse response) {
         Logger.d("Unsubscribed");
@@ -364,7 +373,8 @@ public void onSuccess(PlexResponse response) {
           serverSocket.close();
           serverSocket = null;
         } catch (Exception ex) {
-//            ex.printStackTrace();
+          Logger.d("Exception attempting to close socket.");
+          ex.printStackTrace();
         }
         if(notify)
           onUnsubscribed();
@@ -378,6 +388,15 @@ public void onFailure(Throwable error) {
         Logger.d("failure unsubscribing");
         subscribed = false;
         mHandler.removeCallbacks(subscriptionHeartbeat);
+
+        try {
+          serverSocket.close();
+          serverSocket = null;
+        } catch (Exception ex) {
+          Logger.d("Exception attempting to close socket due to failed unsubscribe.");
+          ex.printStackTrace();
+        }
+
         onUnsubscribed();
       }
     });

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

@@ -40,7 +40,8 @@ public class CastActivity extends PlayerActivity {
 
   private void start(final boolean setView) {
     mClient = getIntent().getParcelableExtra(Intent.EXTRA_CLIENT);
-    Logger.d("[CastActivity] set mClient: %s", mClient);
+    Logger.d("[CastActivity] set client: %s", mClient);
+    Logger.d("[CastActivity] action: %s", getIntent().getAction());
 
     if(getIntent().getBooleanExtra(WearConstants.FROM_WEAR, false)) {
       new SendToDataLayerThread(WearConstants.FINISH, this).start();
@@ -290,6 +291,11 @@ protected void onDestroy() {
 		super.onDestroy();
 	}
 
+  @Override
+  public void doPlayPause() {
+    doPlayPause(null);
+  }
+
   @Override
 	public void doPlayPause(View v) {
 		try {
@@ -302,6 +308,7 @@ public void doPlayPause(View v) {
 		} catch (Exception ex) {}
 	}
 
+  @Override
 	public void doRewind(View v) {
     if(position > -1) {
       nowPlayingMedia.viewOffset = Integer.toString(position - 15000);
@@ -313,6 +320,7 @@ public void doRewind(View v) {
     }
 	}
 
+  @Override
 	public void doForward(View v) {
     if(position > -1) {
       nowPlayingMedia.viewOffset = Integer.toString(position + 30000);

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

@@ -1161,19 +1161,21 @@ public void onRouteAdded(MediaRouter router, MediaRouter.RouteInfo route)
 		{
 			Logger.d("onRouteAdded: %s", route);
 			if(!VoiceControlForPlexApplication.castClients.containsKey(route.getName())) {
-        PlexClient client = new PlexClient();
-        client.isCastClient = true;
-        client.name = route.getName();
-        client.product = route.getDescription();
-        client.castDevice = CastDevice.getFromBundle(route.getExtras());
-        VoiceControlForPlexApplication.castClients.put(client.name, client);
-				Logger.d("Added cast client %s", client.name);
-        VoiceControlForPlexApplication.getInstance().prefs.put(Preferences.SAVED_CAST_CLIENTS, gsonWrite.toJson(VoiceControlForPlexApplication.castClients));
-        // If the "select a plex client" dialog is showing, refresh the list of clients
-        if(deviceSelectDialog != null && deviceSelectDialog.isShowing()) {
-          deviceSelectDialogRefresh();
-				}
+				VoiceControlForPlexApplication.castClients.remove(route.getName());
 			}
+      PlexClient client = new PlexClient();
+      client.isCastClient = true;
+      client.name = route.getName();
+      client.product = route.getDescription();
+      client.castDevice = CastDevice.getFromBundle(route.getExtras());
+      client.machineIdentifier = client.castDevice.getDeviceId();
+      VoiceControlForPlexApplication.castClients.put(client.name, client);
+      Logger.d("Added cast client %s (%s)", client.name, client.machineIdentifier);
+      VoiceControlForPlexApplication.getInstance().prefs.put(Preferences.SAVED_CAST_CLIENTS, gsonWrite.toJson(VoiceControlForPlexApplication.castClients));
+      // If the "select a plex client" dialog is showing, refresh the list of clients
+      if(deviceSelectDialog != null && deviceSelectDialog.isShowing()) {
+        deviceSelectDialogRefresh();
+      }
 		}
 
 		@Override

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

@@ -4,8 +4,12 @@
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.v4.view.GestureDetectorCompat;
+import android.view.GestureDetector;
 import android.view.Menu;
+import android.view.MotionEvent;
 import android.view.View;
+import android.widget.ScrollView;
 import android.widget.SeekBar;
 
 import com.atomjack.shared.PlayerState;
@@ -97,7 +101,6 @@ public void run() {
     }
 	}
 
-
 	private void setState(PlayerState newState) {
 		state = newState;
 		if(state == PlayerState.PAUSED) {
@@ -143,12 +146,14 @@ public void doPlayPause(View v) {
     doPlayPause();
   }
 
+  @Override
 	public void doRewind(View v) {
 		if(position > -1) {
 			mClient.seekTo(position - 15000, null);
 		}
 	}
 
+  @Override
 	public void doForward(View v) {
 		if(position > -1) {
 			mClient.seekTo(position + 30000, null);

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

@@ -5,6 +5,9 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.speech.RecognizerIntent;
+import android.support.v4.view.GestureDetectorCompat;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
 import android.view.View;
 import android.widget.ImageButton;
 import android.widget.SeekBar;
@@ -34,6 +37,8 @@ public abstract class PlayerActivity extends VCFPActivity implements SeekBar.OnS
 	protected TextView currentTimeDisplay;
 	protected TextView durationDisplay;
 
+  protected GestureDetectorCompat mDetector;
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -72,8 +77,52 @@ private void attachUIElements() {
 		playPauseButton = (ImageButton)findViewById(R.id.playPauseButton);
 		currentTimeDisplay = (TextView)findViewById(R.id.currentTimeView);
 		durationDisplay = (TextView)findViewById(R.id.durationView);
+
+    mDetector = new GestureDetectorCompat(this, new TouchGestureListener());
+    View nowPlayingScrollView = findViewById(R.id.nowPlayingScrollView);
+    nowPlayingScrollView.setOnTouchListener(new View.OnTouchListener() {
+      @Override
+      public boolean onTouch(View v, MotionEvent event) {
+        return mDetector.onTouchEvent(event);
+      }
+    });
 	}
 
+  class TouchGestureListener extends GestureDetector.SimpleOnGestureListener {
+    @Override
+    public boolean onSingleTapUp(MotionEvent e) {
+      Logger.d("Single tap.");
+      doPlayPause();
+      return true;
+    }
+
+    @Override
+    public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+      float SWIPE_SPEED_THRESHOLD = 2000;
+
+      try {
+        float diffY = e2.getY() - e1.getY();
+        float diffX = e2.getX() - e1.getX();
+        if (Math.abs(diffX) > Math.abs(diffY) && Math.abs(velocityX) >= SWIPE_SPEED_THRESHOLD) {
+
+          if (diffX > 0) {
+            Logger.d("Doing forward via fling right");
+            doForward(null);
+          } else {
+            Logger.d("Doing back via fling left");
+            doRewind(null);
+          }
+        }
+      } catch (Exception e) {
+        e.printStackTrace();
+      }
+      return true;
+    }
+  }
+
+  public void doRewind(View v) {}
+  public void doForward(View v) {}
+
 	protected void setCurrentTimeDisplay(long seconds) {
 		currentTimeDisplay.setText(VoiceControlForPlexApplication.secondsToTimecode(seconds));
 	}