Pull authentication UX code out of JniInterface

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 72 matching lines @@
 
     /** Host list as it appears to the user. */
     private ListView mHostListView;
 
     /** 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;
 
-    /** Object for fetching OAuth2 access tokens from third party authorization servers. */
-    private ThirdPartyTokenFetcher mTokenFetcher;
+    /**
+     * 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 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.
@@ skipping 102 matching lines @@
 
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
         mDrawerToggle.syncState();
     }
 
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        if (mTokenFetcher != null) {
-            if (mTokenFetcher.handleTokenFetched(intent)) {
-                mTokenFetcher = null;
-            }
+
+        if (mAuthenticator != null) {
+            mAuthenticator.onNewIntent(intent);
         }
     }
 
     /**
      * Called when the activity becomes visible. This happens on initial launch and whenever the
      * user switches to the activity, for example, by using the window-switcher or when coming from
      * the device's lock screen.
      */
     @Override
     public void onStart() {
@@ skipping 85 matching lines @@
         mProgressIndicator = ProgressDialog.show(
                 this,
                 host.name,
                 getString(R.string.footer_connecting),
                 true,
                 true,
                 new DialogInterface.OnCancelListener() {
                     @Override
                     public void onCancel(DialogInterface dialog) {
                         JniInterface.disconnectFromHost();
-                        mTokenFetcher = null;
                     }
                 });
         SessionConnector connector = new SessionConnector(this, this, mHostListLoader);
-        assert mTokenFetcher == null;
-        mTokenFetcher = createTokenFetcher(host);
-        connector.connectToHost(mAccount.name, mToken, host);
+        mAuthenticator = new SessionAuthenticator(this, host);
+        connector.connectToHost(mAccount.name, mToken, host, mAuthenticator);
     }
 
     private void refreshHostList() {
         if (mWaitingForAuthToken) {
             return;
         }
 
         mTriedNewAuthToken = false;
         setHostListProgressVisible(true);
 
@@ skipping 160 matching lines @@
             default:
                 // Unreachable, but required by Google Java style and findbugs.
                 assert false : "Unreached";
         }
 
         if (dismissProgress && mProgressIndicator != null) {
             mProgressIndicator.dismiss();
             mProgressIndicator = null;
         }
     }
-
-    private ThirdPartyTokenFetcher createTokenFetcher(HostInfo host) {
-        ThirdPartyTokenFetcher.Callback callback = new ThirdPartyTokenFetcher.Callback() {
-            @Override
-            public void onTokenFetched(String code, String accessToken) {
-                // The native client sends the OAuth authorization code to the host as the token so
-                // that the host can obtain the shared secret from the third party authorization
-                // server.
-                String token = code;
-
-                // The native client uses the OAuth access token as the shared secret to
-                // authenticate itself with the host using spake.
-                String sharedSecret = accessToken;
-
-                JniInterface.onThirdPartyTokenFetched(token, sharedSecret);
-            }
-        };
-        return new ThirdPartyTokenFetcher(this, host.getTokenUrlPatterns(), callback);
-    }
-
-    public void fetchThirdPartyToken(String tokenUrl, String clientId, String scope) {
-        assert mTokenFetcher != null;
-        mTokenFetcher.fetchToken(tokenUrl, clientId, scope);
-    }
 }