Sort the host list.

remoting/android/java/src/org/chromium/chromoting/Chromoting.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chromoting;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerCallback;
 import android.accounts.AccountManagerFuture;
@@ skipping 16 matching lines @@
 import android.widget.Toast;
 
 import org.chromium.chromoting.jni.JniInterface;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 import java.util.Scanner;
 
 /**
  * The user interface for querying and displaying a user's host list from the directory server. It
  * also requests and renews authentication tokens using the system account manager.
  */
 public class Chromoting extends Activity implements JniInterface.ConnectionListener {
     /** Only accounts of this type will be selectable for authentication. */
     private static final String ACCOUNT_TYPE = "com.google";
 
@@ skipping 210 matching lines @@
                 StringBuilder response = new StringBuilder();
                 Scanner incoming = new Scanner(link.getInputStream());
                 Log.i("auth", "Successfully authenticated to directory server");
                 while (incoming.hasNext()) {
                     response.append(incoming.nextLine());
                 }
                 incoming.close();
 
                 // Interpret what the directory server told us.
                 JSONObject data = new JSONObject(String.valueOf(response)).getJSONObject("data");
-                mHosts = data.getJSONArray("items");
+                mHosts = sortHosts(data.getJSONArray("items"));
                 Log.i("hostlist", "Received host listing from directory server");
             } catch (RuntimeException ex) {
                 // Make sure any other failure is reported to the user (as an unknown error).
                 throw ex;
             } catch (Exception ex) {
                 // Assemble error message to display to the user.
                 String explanation = getString(R.string.error_unknown);
                 if (ex instanceof OperationCanceledException) {
                     explanation = getString(R.string.error_auth_canceled);
                 } else if (ex instanceof AuthenticatorException) {
@@ skipping 37 matching lines @@
             }
 
             // Share our findings with the user.
             runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
                         updateUi();
                     }
             });
         }
+
+        private JSONArray sortHosts(JSONArray hosts) {

[Lambros, 2014/02/06 00:14:06]

nit: This should be static.

I'm in two minds whether this sorting belongs in HostListDirectoryGrabber, or in
updateUi().

With the former, the advantage is that the sorting will happen on the network
thread, potentially keeping the UI more responsive. But it seems less flexible?

[Jamie, 2014/02/06 00:47:16]

Apparently, non-static inner classes can't have static methods.
I think it makes sense to leave it where it is. We can revisit if we want to do
anything more dynamic when displaying hosts.

+            List<JSONObject> hostList = new ArrayList<JSONObject>();
+            for (int i = 0; i < hosts.length(); i++) {
+                try {
+                    hostList.add(hosts.getJSONObject(i));
+                } catch (JSONException ex) {
+                  // Ignore non-object entries.

[Lambros, 2014/02/06 00:14:06]

nit: 4-space indent

[Jamie, 2014/02/06 00:47:16]

Done.

+                }
+            }
+
+            Comparator<JSONObject> compareHosts = new Comparator<JSONObject>() {
+                public int compare(JSONObject a, JSONObject b) {
+                    try {
+                        boolean aOnline = a.getString("status").equals("ONLINE");
+                        boolean bOnline = b.getString("status").equals("ONLINE");
+                        if (aOnline && !bOnline) {
+                          return -1;

[Lambros, 2014/02/06 00:14:06]

nit: 4-space indent

[Jamie, 2014/02/06 00:47:16]

Done.

+                        } else if (bOnline && !aOnline) {

[Lambros, 2014/02/06 00:14:06]

nit: No 'else' after return.

[Jamie, 2014/02/06 00:47:16]

Done.

+                          return 1;

[Lambros, 2014/02/06 00:14:06]

nit: 4-space indent

[Jamie, 2014/02/06 00:47:16]

Done.

+                        }
+                        String aName = a.getString("hostName").toUpperCase();
+                        String bName = b.getString("hostName").toUpperCase();
+                        return aName.compareTo(bName);
+                    } catch (JSONException ex) {
+                        return 0;
+                    }
+                }
+            };
+            Collections.sort(hostList, compareHosts);
+
+            JSONArray result = new JSONArray(hostList);
+            return result;
+        }
+

[Lambros, 2014/02/06 00:14:06]

nit: Remove blank line.

[Jamie, 2014/02/06 00:47:16]

Done.

     }
 
     /**
      * Updates the infotext and host list display.
      * This method affects the UI and must be run on the main thread.
      */
     private void updateUi() {
         synchronized (mLock) {
             mRefreshButton.setEnabled(mAccount != null);
             if (mAccount != null) {
@@ skipping 82 matching lines @@
                 // Unreachable, but required by Google Java style and findbugs.
                 assert false : "Unreached";
         }
 
         if (dismissProgress && mProgressIndicator != null) {
             mProgressIndicator.dismiss();
             mProgressIndicator = null;
         }
     }
 }