Moved client selection completely into cast icon. Fixed hiding and showing of cast icon when network state toggles. Don't show notification when the client is the local device.

Author: Chris Bellew

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

@@ -24,6 +24,8 @@ public class LocalScan {
 	private Dialog searchDialog;
 	private Dialog deviceSelectDialog = null;
 	private ScanHandler scanHandler;
+  private boolean cancelScan = false;
+  public boolean isScanning = false;
 
 	public LocalScan(Context ctx, Class cls, ScanHandler handler) {
 		context = ctx;
@@ -37,6 +39,7 @@ public void searchForPlexServers() {
 
 	public void searchForPlexServers(boolean silent) {
 		Logger.d("searchForPlexServers()");
+    isScanning = true;
 		if(!VoiceControlForPlexApplication.isWifiConnected(context)) {
 			VoiceControlForPlexApplication.showNoWifiDialog(context);
 			return;
@@ -74,6 +77,11 @@ public void showPlexServers() {
 	}
 
 	public void showPlexServers(ConcurrentHashMap<String, PlexServer> servers) {
+    isScanning = false;
+    if(cancelScan) {
+      cancelScan = false;
+      return;
+    }
 		if(searchDialog != null)
 			searchDialog.dismiss();
 		if(deviceSelectDialog == null) {
@@ -101,24 +109,36 @@ public void onItemClick(AdapterView<?> parentAdapter, View view, int position, l
 		});
 	}
 
+  public void cancelScan() {
+    Logger.d("[LocalScan] canceling scan");
+    cancelScan = true;
+  }
+
   public void searchForPlexClients() {
-    searchForPlexClients(false);
+    searchForPlexClients(false, true);
   }
 
   public void searchForPlexClients(boolean connectToClient) {
+    searchForPlexClients(connectToClient, true);
+  }
+
+  public void searchForPlexClients(boolean connectToClient, boolean showSearchDialog) {
 		Logger.d("[LocalScan] searchForPlexClients()");
+    isScanning = true;
 		if(!VoiceControlForPlexApplication.isWifiConnected(context)) {
 			VoiceControlForPlexApplication.showNoWifiDialog(context);
 			return;
 		}
 
-		searchDialog = new Dialog(context);
+    if(showSearchDialog) {
+      searchDialog = new Dialog(context);
 
-		searchDialog.setContentView(R.layout.search_popup);
-		searchDialog.setTitle(context.getResources().getString(R.string.searching_for_plex_clients));
-    searchDialog.setOnCancelListener(searchDialogCancel);
+      searchDialog.setContentView(R.layout.search_popup);
+      searchDialog.setTitle(context.getResources().getString(R.string.searching_for_plex_clients));
+      searchDialog.setOnCancelListener(searchDialogCancel);
 
-		searchDialog.show();
+      searchDialog.show();
+    }
 
 		Intent mServiceIntent = new Intent(context, GDMService.class);
 		mServiceIntent.putExtra(GDMService.PORT, 32412); // Port for clients
@@ -155,6 +175,11 @@ public boolean isDeviceDialogShowing() {
   }
 
 	public void showPlexClients(boolean showResume, final ScanHandler onFinish) {
+    isScanning = false;
+    if(cancelScan) {
+      cancelScan = false;
+      return;
+    }
     if (searchDialog != null)
       searchDialog.dismiss();
     if (deviceSelectDialog == null) {

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

@@ -45,12 +45,12 @@ public void onReceive(Context context, Intent intent) {
             VoiceControlForPlexApplication.getInstance().onNetworkDisconnected();
           }
         } else {
-          connected = true;
           int type = activeNetwork.getType();
-          if (type != currentState) {
+          if (type != currentState || !connected) {
             currentState = type;
             VoiceControlForPlexApplication.getInstance().onNetworkConnected(currentState);
           }
+          connected = true;
         }
 
         /*

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

@@ -360,10 +360,6 @@ public static String generateRandomString() {
     return new BigInteger(130, random).toString(32).substring(0, 12);
   }
 
-  public void setNotification(final PlexClient client, final PlayerState currentState, final PlexMedia media) {
-    setNotification(client, currentState, media, false);
-  }
-
   private Bitmap getCachedBitmap(String key) {
     if(key == null)
       return null;
@@ -414,7 +410,14 @@ protected Object doInBackground(Object[] objects) {
       }.execute();
   }
 
+  public void setNotification(final PlexClient client, final PlayerState currentState, final PlexMedia media) {
+    setNotification(client, currentState, media, false);
+  }
+
   public void setNotification(final PlexClient client, final PlayerState currentState, final PlexMedia media, boolean skipThumb) {
+
+    if(client.isLocalDevice())
+      return;
     Logger.d("Setting notification, client: %s, media: %s", client, media);
     if(client == null) {
       Logger.d("Client is null for some reason");

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

@@ -268,7 +268,7 @@ private void initMainWithServer() {
       clientName = getString(R.string.this_device);
 		MainSetting setting_data[] = new MainSetting[] {
 			new MainSetting(MainListAdapter.SettingHolder.TAG_SERVER, getResources().getString(R.string.stream_video_from_server), server.owned ? server.name : server.sourceTitle),
-			new MainSetting(MainListAdapter.SettingHolder.TAG_CLIENT, getResources().getString(R.string.to_the_client), clientName),
+//			new MainSetting(MainListAdapter.SettingHolder.TAG_CLIENT, getResources().getString(R.string.to_the_client), clientName),
 			new MainSetting(MainListAdapter.SettingHolder.TAG_FEEDBACK, getResources().getString(R.string.feedback), VoiceControlForPlexApplication.getInstance().prefs.get(Preferences.FEEDBACK, FEEDBACK_TOAST) == FEEDBACK_VOICE ? getResources().getString(R.string.voice) : getResources().getString(R.string.toast)),
 			new MainSetting(MainListAdapter.SettingHolder.TAG_ERRORS, getResources().getString(R.string.errors), VoiceControlForPlexApplication.getInstance().prefs.get(Preferences.ERRORS, FEEDBACK_TOAST) == FEEDBACK_VOICE ? getResources().getString(R.string.voice) : getResources().getString(R.string.toast))
 		};
@@ -333,6 +333,7 @@ public void onFailure(int statusCode) {
             } else
   						localScan.searchForPlexServers();
 					}
+        /*
 				} else if (holder.tag.equals(holder.TAG_CLIENT)) {
           if(!currentNetworkState.equals(NetworkState.WIFI)) {
             if(currentNetworkState.equals(NetworkState.MOBILE)) {
@@ -345,6 +346,7 @@ public void onFailure(int statusCode) {
             VoiceControlForPlexApplication.clients = new HashMap<String, PlexClient>();
             localScan.searchForPlexClients();
           }
+        */
 				} else if (holder.tag.equals(holder.TAG_FEEDBACK)) {
 					selectFeedback();
 				} else if (holder.tag.equals(holder.TAG_ERRORS)) {
@@ -835,6 +837,8 @@ protected void setServer(PlexServer _server) {
 
   @Override
   protected void setClient(PlexClient _client) {
+    super.setClient(_client);
+    Logger.d("[MainActivity] setClient");
     if(!VoiceControlForPlexApplication.getInstance().hasChromecast() && _client.isCastClient) {
       showChromecastPurchase(_client, new Runnable() {
         @Override

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

@@ -31,6 +31,7 @@
 import com.atomjack.vcfp.PlayerState;
 import com.atomjack.vcfp.PlexHeaders;
 import com.atomjack.vcfp.PlexSubscription;
+import com.atomjack.vcfp.Preferences;
 import com.atomjack.vcfp.R;
 import com.atomjack.vcfp.ScanHandler;
 import com.atomjack.vcfp.ServerFindHandler;
@@ -63,7 +64,6 @@
 
 public abstract class VCFPActivity extends ActionBarActivity implements PlexSubscription.PlexListener, CastPlayerManager.CastListener, VoiceControlForPlexApplication.NetworkChangeListener {
 	protected PlexMedia nowPlayingMedia;
-	protected boolean subscribed = false;
 	protected boolean subscribing = false;
 	protected PlexClient mClient;
 
@@ -229,8 +229,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
 					subscribing = true;
           if(VoiceControlForPlexApplication.clients.size() == 0 && !VoiceControlForPlexApplication.hasDoneClientScan) {
             localScan.searchForPlexClients(true);
-          } else
-  					localScan.showPlexClients(false, onClientChosen);
+          } else {
+            localScan.showPlexClients(false, onClientChosen);
+            // Kick off a client scan in the background
+            localScan.searchForPlexClients(true, false);
+          }
 				} else if(!subscribing) {
           // For some reason we sometimes lost mClient here, even though we're subscribed. If we do, let's try to get the client from the subscription manager
           if(mClient == null) {
@@ -275,11 +278,15 @@ public void onClick(DialogInterface dialogInterface, int i) {
 	protected ScanHandler onClientChosen = new ScanHandler() {
 		@Override
 		public void onDeviceSelected(PlexDevice device, boolean resume) {
+      if(localScan.isScanning)
+        localScan.cancelScan();
       subscribing = false;
       if(device != null) {
         Logger.d("[VCFPActivity] onClientChosen: %s", device.name);
         PlexClient clientSelected = (PlexClient) device;
 
+        setClient(clientSelected);
+
         // Start animating the action bar icon
         final MenuItem castIcon = menu.findItem(R.id.action_cast);
         castIcon.setIcon(R.drawable.mr_ic_media_route_connecting_holo_dark);
@@ -707,5 +714,7 @@ protected void setServer(PlexServer _server) {
   }
 
   protected void setClient(PlexClient _client) {
+    Logger.d("[VCFPActivity] setClient");
+    VoiceControlForPlexApplication.getInstance().prefs.put(Preferences.CLIENT, gsonWrite.toJson(_client));
   }
 }

Voice Control For Plex/src/main/java/com/atomjack/vcfp/model/PlexClient.java

@@ -3,6 +3,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import com.atomjack.vcfp.Utils;
 import com.atomjack.vcfp.net.PlexHttpClient;
 import com.atomjack.vcfp.net.PlexHttpResponseHandler;
 import com.google.android.gms.cast.CastDevice;
@@ -108,7 +109,6 @@ private void adjustPlayback(String which, PlexHttpResponseHandler responseHandle
 
   public PlexResponse pause() {
     return adjustPlayback("pause");
-//    adjustPlayback("pause", responseHandler);
   }
 
   public PlexResponse stop() {
@@ -134,4 +134,9 @@ private PlexResponse adjustPlayback(String which) {
     }
     return null;
   }
+
+  public boolean isLocalDevice() {
+    String localip = Utils.getIPAddress(true);
+    return localip.equals(address);
+  }
 }