Implement HostListManager by Refactoring HostListLoader

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.annotation.SuppressLint;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ skipping 30 matching lines @@
 import org.chromium.chromoting.jni.ConnectionListener;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
 /**
  * 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 AppCompatActivity implements ConnectionListener,
-        AccountSwitcher.Callback, HostListLoader.Callback, View.OnClickListener {
+        AccountSwitcher.Callback, HostListManager.Callback, View.OnClickListener {
     private static final String TAG = "Chromoting";
 
     /** Only accounts of this type will be selectable for authentication. */
     private static final String ACCOUNT_TYPE = "com.google";
 
     /** Scope to use when fetching the OAuth token. */
     private static final String TOKEN_SCOPE = "oauth2:https://www.googleapis.com/auth/chromoting "
             + "https://www.googleapis.com/auth/googletalk";
 
     /** Result code used for starting {@link DesktopActivity}. */
     public static final int DESKTOP_ACTIVITY = 0;
 
     /** Result code used for starting {@link CardboardDesktopActivity}. */
     public static final int CARDBOARD_DESKTOP_ACTIVITY = 1;
 
     /** Preference names for storing selected and recent accounts. */
     private static final String PREFERENCE_SELECTED_ACCOUNT = "account_name";
     private static final String PREFERENCE_RECENT_ACCOUNT_PREFIX = "recent_account_";
     private static final String PREFERENCE_EXPERIMENTAL_FLAGS = "flags";
 
     /** User's account name (email). */
     private String mAccount;
 
     /** Account auth token. */
     private String mToken;
 
     /** Helper for fetching the host list. */
-    private HostListLoader mHostListLoader;
+    private HostListManager mHostListManager;
 
     /** List of hosts. */
     private HostInfo[] mHosts = new HostInfo[0];
 
     /** Refresh button. */
     private MenuItem mRefreshButton;
 
     /** Host list chooser view shown when at least one host is configured. */
     private ListView mHostListView;
 
     /** View shown when the user has no configured hosts or host list couldn't be retrieved. */
     private View mEmptyView;
 
     /** Progress view shown instead of the host list when the host list is loading. */
     private View mProgressView;
 
     /** Dialog for reporting connection progress. */
     private ProgressDialog mProgressIndicator;
 
     /**
      * Helper used by SessionConnection for session authentication. Receives onNewIntent()
      * notifications to handle third-party authentication.
      */
     private SessionAuthenticator mAuthenticator;
 
     /**
-     * This is set when receiving an authentication error from the HostListLoader. If that occurs,
+     * This is set when receiving an authentication error from the HostListManager. If that occurs,
      * this flag is set and a fresh authentication token is fetched from the AccountsService, and
      * used to request the host list a second time.
      */
     boolean mTriedNewAuthToken;
 
     /**
      * Flag to track whether a call to AccountManager.getAuthToken() is currently pending.
      * This avoids infinitely-nested calls in case onStart() gets triggered a second time
      * while a token is being fetched.
      */
@@ skipping 68 matching lines @@
      */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
 
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
         mTriedNewAuthToken = false;
-        mHostListLoader = new HostListLoader();
+        mHostListManager = new HostListManager();
 
         // Get ahold of our view widgets.
         mHostListView = (ListView) findViewById(R.id.hostList_chooser);
         mEmptyView = findViewById(R.id.hostList_empty);
         mHostListView.setOnItemClickListener(
                 new AdapterView.OnItemClickListener() {
                     @Override
                     public void onItemClick(AdapterView<?> parent, View view, int position,
                             long id) {
                         onHostClicked(position);
@@ skipping 261 matching lines @@
                 new DialogInterface.OnCancelListener() {
                     @Override
                     public void onCancel(DialogInterface dialog) {
                         if (mClient != null) {
                             mClient.destroy();
                             mClient = null;
                         }
                     }
                 });
 
-        SessionConnector connector = new SessionConnector(mClient, this, this, mHostListLoader);
+        SessionConnector connector = new SessionConnector(mClient, this, this, mHostListManager);
         mAuthenticator = new SessionAuthenticator(this, mClient, host);
         connector.connectToHost(mAccount, mToken, host, mAuthenticator,
                 getPreferences(MODE_PRIVATE).getString(PREFERENCE_EXPERIMENTAL_FLAGS, ""));
     }
 
     private void refreshHostList() {
         if (mWaitingForAuthToken) {
             return;
         }
 
         mTriedNewAuthToken = false;
         showHostListLoadingIndicator();
 
         // The refresh button simply makes use of the currently-chosen account.
         requestAuthToken(false);
     }
 
     private void requestAuthToken(boolean expireCurrentToken) {
         mWaitingForAuthToken = true;
 
         OAuthTokenFetcher fetcher = new OAuthTokenFetcher(this, mAccount, TOKEN_SCOPE,
                 new OAuthTokenFetcher.Callback() {
                     @Override
                     public void onTokenFetched(String token) {
                         mWaitingForAuthToken = false;
                         mToken = token;
-                        mHostListLoader.retrieveHostList(mToken, Chromoting.this);
+                        mHostListManager.retrieveHostList(mToken, Chromoting.this);
                     }
 
                     @Override
                     public void onError(OAuthTokenFetcher.Error error) {
                         mWaitingForAuthToken = false;
                         updateHostListView();
                         String explanation = getString(error == OAuthTokenFetcher.Error.NETWORK
                                 ? R.string.error_network_error : R.string.error_unexpected);
                         Toast.makeText(Chromoting.this, explanation, Toast.LENGTH_LONG).show();
                     }
@@ skipping 22 matching lines @@
         showNoAccountsDialog();
     }
 
     @Override
     public void onRequestCloseDrawer() {
         mDrawerLayout.closeDrawers();
     }
 
     @Override
     public void onHostListReceived(HostInfo[] hosts) {
-        // Store a copy of the array, so that it can't be mutated by the HostListLoader. HostInfo
+        // Store a copy of the array, so that it can't be mutated by the HostListManager. HostInfo
         // is an immutable type, so a shallow copy of the array is sufficient here.
         mHosts = Arrays.copyOf(hosts, hosts.length);
         updateHostListView();
         updateUi();
     }
 
     @Override
-    public void onError(HostListLoader.Error error) {
+    public void onHostUpdated() {
+        // Not implemented Yet.
+    }
+
+    @Override
+    public void onHostDeleted() {
+        // Not implemented Yet.
+    }
+
+    @Override
+    public void onError(HostListManager.Error error) {
         String explanation = null;
         switch (error) {
             case AUTH_FAILED:
                 break;
             case NETWORK_ERROR:
                 explanation = getString(R.string.error_network_error);
                 break;
             case UNEXPECTED_RESPONSE:
             case SERVICE_UNAVAILABLE:
             case UNKNOWN:
@@ skipping 74 matching lines @@
                 // Unreachable, but required by Google Java style and findbugs.
                 assert false : "Unreached";
         }
 
         if (dismissProgress && mProgressIndicator != null) {
             mProgressIndicator.dismiss();
             mProgressIndicator = null;
         }
     }
 }