Don't save cast clients, just get ones currently available. Use default user icon in case no gravatar icon is found. Fixed layout of initial server & client scan popup.

Author: Chris Bellew

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

@@ -210,7 +210,6 @@ public void onCreate() {
 
     // Load saved clients and servers
     Type clientType = new TypeToken<HashMap<String, PlexClient>>(){}.getType();
-    VoiceControlForPlexApplication.castClients = gsonRead.fromJson(VoiceControlForPlexApplication.getInstance().prefs.get(Preferences.SAVED_CAST_CLIENTS, "{}"), clientType);
     VoiceControlForPlexApplication.clients = gsonRead.fromJson(VoiceControlForPlexApplication.getInstance().prefs.get(Preferences.SAVED_CLIENTS, "{}"), clientType);
     Type serverType = new TypeToken<ConcurrentHashMap<String, PlexServer>>(){}.getType();
     VoiceControlForPlexApplication.servers = gsonRead.fromJson(VoiceControlForPlexApplication.getInstance().prefs.get(Preferences.SAVED_SERVERS, "{}"), serverType);
@@ -844,4 +843,11 @@ public int getSecondsSinceLastServerScan() {
     Logger.d("lastServerScan: %s", lastServerScan);
     return (int)((now.getTime() - lastServerScan.getTime())/1000);
   }
+
+  public String getUserThumbKey() {
+    String key = "user_thumb_key";
+    if(prefs.getString(Preferences.PLEX_USERNAME) != null)
+      key += prefs.getString(Preferences.PLEX_USERNAME);
+    return key;
+  }
 }

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

@@ -160,8 +160,6 @@ public class MainActivity extends AppCompatActivity
 
   protected static final int REQUEST_WRITE_STORAGE = 112;
 
-  public static String USER_THUMB_KEY = "user_thumb_key";
-
   // Whether or not we received device logs from a wear device. This will allow a timer to be run in case wear support has
   // been purchased, but no wear device is paired. When this happens, we'll go ahead and email just the mobile device's logs
   //
@@ -434,7 +432,7 @@ private void init() {
               .addControlCategory(CastMediaControlIntent.categoryForCast(BuildConfig.CHROMECAST_APP_ID))
               .build();
       mMediaRouterCallback = new MediaRouterCallback();
-      mMediaRouter.addCallback(mMediaRouteSelector, mMediaRouterCallback, MediaRouter.CALLBACK_FLAG_REQUEST_DISCOVERY);
+      mMediaRouter.addCallback(mMediaRouteSelector, mMediaRouterCallback, MediaRouter.CALLBACK_FLAG_PERFORM_ACTIVE_SCAN);
 
       server = gsonRead.fromJson(prefs.get(Preferences.SERVER, ""), PlexServer.class);
       if (server == null)
@@ -699,7 +697,6 @@ private void showFindingPlexClientsAndServers() {
     View layout = inflater.inflate(R.layout.search_popup, null);
 
     alertDialog = new AlertDialog.Builder(this)
-            .setTitle(R.string.finding_plex_clients_and_servers)
             .setCancelable(false)
             .setView(layout)
             .create();
@@ -1188,7 +1185,7 @@ private void setUserThumb() {
   }
 
   private void setUserThumb(boolean skipThumb) {
-    final Bitmap bitmap = VoiceControlForPlexApplication.getInstance().getCachedBitmap(USER_THUMB_KEY);
+    final Bitmap bitmap = VoiceControlForPlexApplication.getInstance().getCachedBitmap(VoiceControlForPlexApplication.getInstance().getUserThumbKey());
     if(bitmap == null && !skipThumb) {
       fetchUserThumb();
     } else {
@@ -1197,7 +1194,10 @@ private void setUserThumb(boolean skipThumb) {
         public void run() {
           View navHeader = navigationViewMain.getHeaderView(0);
           ImageView imageView = (ImageView) navHeader.findViewById(R.id.navHeaderUserIcon);
-          imageView.setImageBitmap(bitmap);
+          if(bitmap == null)
+            imageView.setImageResource(R.drawable.nav_default_user);
+          else
+            imageView.setImageBitmap(bitmap);
         }
       });
     }
@@ -1208,13 +1208,15 @@ private void fetchUserThumb() {
       @Override
       protected Void doInBackground(Void... params) {
         try {
-          String url = String.format("http://www.gravatar.com/avatar/%s?s=60", Utils.md5(prefs.getString(Preferences.PLEX_EMAIL)));
+          String url = String.format("http://www.gravatar.com/avatar/%s?s=60&d=404", Utils.md5(prefs.getString(Preferences.PLEX_EMAIL)));
           Logger.d("url: %s", url);
           byte[] imageData = PlexHttpClient.getSyncBytes(url);
-          Logger.d("got %d bytes", imageData.length);
-          InputStream is = new ByteArrayInputStream(imageData);
-          is.reset();
-          VoiceControlForPlexApplication.getInstance().mSimpleDiskCache.put(USER_THUMB_KEY, is);
+          if(imageData != null) {
+            Logger.d("got %d bytes", imageData.length);
+            InputStream is = new ByteArrayInputStream(imageData);
+            is.reset();
+            VoiceControlForPlexApplication.getInstance().mSimpleDiskCache.put(VoiceControlForPlexApplication.getInstance().getUserThumbKey(), is);
+          }
           setUserThumb(true);
         }
         catch(SocketTimeoutException e) {
@@ -1486,19 +1488,23 @@ private void saveSettings() {
     prefs.put(Preferences.RESUME, prefs.get(Preferences.RESUME, false));
   }
 
+  public void deviceSelectDialogRefresh() {
+    ListView serverListView = (ListView) deviceSelectDialog.findViewById(R.id.serverListView);
+    PlexListAdapter adapter = (PlexListAdapter)serverListView.getAdapter();
+    adapter.setClients(VoiceControlForPlexApplication.getAllClients());
+    adapter.notifyDataSetChanged();
+  }
+
   private class MediaRouterCallback extends MediaRouter.Callback {
     @Override
     public void onRouteRemoved(MediaRouter router, MediaRouter.RouteInfo route) {
       super.onRouteRemoved(router, route);
       Logger.d("Cast Client %s has gone missing. Removing.", route.getName());
       if(VoiceControlForPlexApplication.castClients.containsKey(route.getName())) {
         VoiceControlForPlexApplication.castClients.remove(route.getName());
-        prefs.put(Preferences.SAVED_CAST_CLIENTS, gsonWrite.toJson(VoiceControlForPlexApplication.castClients));
-        // If the "select a plex client" dialog is showing, refresh the list of clients
-        // TODO: Refresh device dialog if needed
-//        if(localScan.isDeviceDialogShowing()) {
-//          localScan.deviceSelectDialogRefresh();
-//        }
+        if(deviceSelectDialog != null && deviceSelectDialog.isShowing()) {
+          deviceSelectDialogRefresh();
+        }
       }
     }
 
@@ -1513,18 +1519,13 @@ public void onRouteAdded(MediaRouter router, MediaRouter.RouteInfo route)
       client.isCastClient = true;
       client.name = route.getName();
       client.product = route.getDescription();
-//      client.castRouteInfo = route;
       client.castDevice = CastDevice.getFromBundle(route.getExtras());
       client.machineIdentifier = client.castDevice.getDeviceId();
-//      VoiceControlForPlexApplication.castRoutes.put(client.machineIdentifier, route);
       VoiceControlForPlexApplication.castClients.put(client.name, client);
       Logger.d("Added cast client %s (%s)", client.name, client.machineIdentifier);
-      prefs.put(Preferences.SAVED_CAST_CLIENTS, gsonWrite.toJson(VoiceControlForPlexApplication.castClients));
-      // If the "select a plex client" dialog is showing, refresh the list of clients
-      // TODO: implement this?
-//      if(deviceSelectDialog != null && deviceSelectDialog.isShowing()) {
-//        deviceSelectDialogRefresh();
-//      }
+      if(deviceSelectDialog != null && deviceSelectDialog.isShowing()) {
+        deviceSelectDialogRefresh();
+      }
     }
 
     @Override

mobile/src/main/res/layout/search_popup.xml

@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:background="@color/settings_popup_background"
+              android:padding="20dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/finding_plex_clients_and_servers"
+        android:id="@+id/textView22"
+        android:textColor="@color/white"/>
 
     <ProgressBar
         android:id="@+id/progressBar1"