Revert of Refactor Chromoting JNI code to use jni/Client (Java changes only).

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.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
@@ skipping 18 matching lines @@
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.Toast;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.Log;
 import org.chromium.chromoting.accountswitcher.AccountSwitcher;
 import org.chromium.chromoting.accountswitcher.AccountSwitcherFactory;
 import org.chromium.chromoting.help.HelpContext;
 import org.chromium.chromoting.help.HelpSingleton;
-import org.chromium.chromoting.jni.Client;
 import org.chromium.chromoting.jni.ConnectionListener;
 import org.chromium.chromoting.jni.JniInterface;
 
 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.
  */
@@ skipping 61 matching lines @@
      * while a token is being fetched.
      */
     private boolean mWaitingForAuthToken = false;
 
     private DrawerLayout mDrawerLayout;
 
     private ActionBarDrawerToggle mDrawerToggle;
 
     private AccountSwitcher mAccountSwitcher;
 
-    /** The currently-connected Client, if any. */
-    private Client mClient;
-
     /** Shows a warning explaining that a Google account is required, then closes the activity. */
     private void showNoAccountsDialog() {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setMessage(R.string.noaccounts_message);
         builder.setPositiveButton(R.string.noaccounts_add_account,
                 new DialogInterface.OnClickListener() {
                     @SuppressLint("InlinedApi")
                     @Override
                     public void onClick(DialogInterface dialog, int id) {
                         Intent intent = new Intent(Settings.ACTION_ADD_ACCOUNT);
@@ skipping 212 matching lines @@
             preferences.putString(prefName, recents[i]);
         }
 
         preferences.apply();
     }
 
     /** Called when the activity is finally finished. */
     @Override
     public void onDestroy() {
         super.onDestroy();
+        JniInterface.disconnectFromHost();
         mAccountSwitcher.destroy();
-
-        // TODO(lambroslambrou): Determine whether we really need to tear down the connection here,
-        // so we can remove this code.
-        if (mClient != null) {
-            mClient.destroy();
-            mClient = null;
-        }
     }
 
     /** Called when a child Activity exits and sends a result back to this Activity. */
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         mAccountSwitcher.onActivityResult(requestCode, resultCode, data);
 
         if (requestCode == OAuthTokenFetcher.REQUEST_CODE_RECOVER_FROM_OAUTH_ERROR) {
             if (resultCode == RESULT_OK) {
                 // User gave OAuth permission to this app (or recovered from any OAuth failure),
@@ skipping 73 matching lines @@
         HostInfo host = mHosts[index];
         if (host.isOnline) {
             connectToHost(host);
         } else {
             String tooltip = host.getHostOfflineReasonText(this);
             Toast.makeText(this, tooltip, Toast.LENGTH_SHORT).show();
         }
     }
 
     private void connectToHost(HostInfo host) {
-        if (mClient != null) {
-            mClient.destroy();
-        }
-
-        mClient = new Client();
         mProgressIndicator = ProgressDialog.show(
                 this,
                 host.name,
                 getString(R.string.footer_connecting),
                 true,
                 true,
                 new DialogInterface.OnCancelListener() {
                     @Override
                     public void onCancel(DialogInterface dialog) {
-                        if (mClient != null) {
-                            mClient.destroy();
-                            mClient = null;
-                        }
+                        JniInterface.disconnectFromHost();
                     }
                 });
-
-        SessionConnector connector = new SessionConnector(mClient, this, this, mHostListLoader);
-        mAuthenticator = new SessionAuthenticator(this, mClient, host);
+        SessionConnector connector = new SessionConnector(this, this, mHostListLoader);
+        mAuthenticator = new SessionAuthenticator(this, host);
         connector.connectToHost(mAccount, mToken, host, mAuthenticator,
                 getPreferences(MODE_PRIVATE).getString(PREFERENCE_EXPERIMENTAL_FLAGS, ""));
     }
 
     private void refreshHostList() {
         if (mWaitingForAuthToken) {
             return;
         }
 
         mTriedNewAuthToken = false;
@@ skipping 150 matching lines @@
                 // Unreachable, but required by Google Java style and findbugs.
                 assert false : "Unreached";
         }
 
         if (dismissProgress && mProgressIndicator != null) {
             mProgressIndicator.dismiss();
             mProgressIndicator = null;
         }
     }
 }