Show title for select client/server dialogs.

Author: Chris Bellew

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

@@ -420,59 +420,27 @@ public void onItemClick(AdapterView<?> adapter, View view, int position,
 						return;
 					}
 
-          searchDialog = new Dialog(MainActivity.this);
+          LayoutInflater inflater = getLayoutInflater();
+          View layout = inflater.inflate(R.layout.search_popup, null);
 
-          searchDialog.setContentView(R.layout.search_popup);
-          searchDialog.setTitle(getResources().getString(R.string.searching_for_plex_servers));
+          AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
+
+          builder.setView(layout);
+          builder.setTitle(getResources().getString(R.string.searching_for_plex_servers));
 
-          searchDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+          builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
             @Override
             public void onCancel(DialogInterface dialogInterface) {
               serverScanCanceled = true;
-//              RemoteScan.cancelScan();
             }
           });
+          searchDialog = builder.create();
           searchDialog.show();
           Intent scannerIntent = new Intent(MainActivity.this, PlexScannerService.class);
           scannerIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
           scannerIntent.putExtra(PlexScannerService.CLASS, MainActivity.class);
           scannerIntent.setAction(PlexScannerService.ACTION_SCAN_SERVERS);
           startService(scannerIntent);
-
-          /*
-					if(authToken != null) {
-
-
-						RemoteScan.refreshResources(authToken, new RemoteScan.RefreshResourcesResponseHandler() {
-							@Override
-							public void onSuccess() {
-                // Finished getting servers from plex.tv. If no wifi connection is detected, just show the servers we found.
-								if(currentNetworkState.equals(NetworkState.MOBILE)) {
-                  searchDialog.dismiss();
-                  localScan.showPlexServers();
-                } else
-                  localScan.searchForPlexServers();
-							}
-
-							@Override
-							public void onFailure(int statusCode) {
-								if(statusCode == 401) {
-									authToken = null;
-                  VoiceControlForPlexApplication.getInstance().prefs.remove(Preferences.AUTHENTICATION_TOKEN);
-									feedback.e(R.string.login_unauthorized);
-									switchLogin();
-								} else
-									feedback.e(R.string.remote_scan_error);
-							}
-						});
-					} else {
-						Logger.d("not logged in");
-            if(currentNetworkState.equals(NetworkState.MOBILE)) {
-              feedback.e(R.string.mobile_connection_login_required);
-            } else
-  						localScan.searchForPlexServers();
-					}
-					*/
 				} else if (holder.tag.equals(holder.TAG_FEEDBACK)) {
 					selectFeedback();
 				} else if (holder.tag.equals(holder.TAG_ERRORS)) {

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

@@ -860,15 +860,11 @@ public void showPlexServers(ConcurrentHashMap<String, PlexServer> servers, final
       cancelScan = false;
       return;
     }
-//    if(searchDialog != null)
-//      searchDialog.dismiss();
-    if(deviceSelectDialog == null) {
-      deviceSelectDialog = new Dialog(this);
-    }
-    deviceSelectDialog.setContentView(R.layout.server_select);
-    deviceSelectDialog.setTitle("Select a Plex Server");
+
+    deviceSelectDialog = getDeviceSelectDialog(getResources().getString(R.string.select_plex_server));
     deviceSelectDialog.show();
 
+
     final ListView serverListView = (ListView) deviceSelectDialog.findViewById(R.id.serverListView);
     if(servers == null)
       servers = new ConcurrentHashMap<String, PlexServer>(VoiceControlForPlexApplication.servers);
@@ -887,6 +883,15 @@ public void onItemClick(AdapterView<?> parentAdapter, View view, int position, l
     });
   }
 
+  public Dialog getDeviceSelectDialog(String title) {
+    AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    LayoutInflater inflater = getLayoutInflater();
+    View layout = inflater.inflate(R.layout.server_select, null);
+    builder.setView(layout);
+    builder.setTitle(title);
+    return builder.create();
+  }
+
   public void showPlexClients() {
     showPlexClients(false, null);
   }
@@ -901,11 +906,8 @@ public void showPlexClients(boolean showResume, final ScanHandler onFinish) {
       cancelScan = false;
       return;
     }
-    if (deviceSelectDialog == null) {
-      deviceSelectDialog = new Dialog(this);
-    }
-    deviceSelectDialog.setContentView(R.layout.server_select);
-    deviceSelectDialog.setTitle(R.string.select_plex_client);
+    deviceSelectDialog = getDeviceSelectDialog(getString(R.string.select_plex_client));
+
     deviceSelectDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
       @Override
       public void onCancel(DialogInterface dialogInterface) {

mobile/src/main/res/values/strings.xml

@@ -152,4 +152,5 @@
     <string name="login_incorrect">Sorry, but your username or password is incorrect.</string>
     <string name="email_device_logs_write_storage_denied">Permission to write to the device\'s external storage is required in order to email device logs.</string>
     <string name="video_attempted_on_audio_only_device">Sorry, but video playback is not supported on %s.</string>
+    <string name="select_plex_server">Select a Plex Server</string>
 </resources>