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 279 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();
+        if (Client.getClient() != null) {
+            Client.getClient().destroy();

[Sergey Ulanov, 2016/01/30 01:03:23]

keep the Client object created in connectToHost() (i.e. store it as mClient) and
use it here instead of calling getClient(). The fact that that Client is a
singleton should only matter in JniInterface

[Lambros, 2016/02/03 22:57:43]

I'm not sure we should be disconnecting anyway in Chromoting.onDestroy(). It
should be fine for the OS to kill the Chromoting activity and keep the Desktop
activity alive.
But in the interest of keeping this as a refactoring CL without changing
behavior, I've added mClient and a TODO.

+        }
     }
 
     /** 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 (Client.getClient() != null) {
+            Client.getClient().destroy();
+        }
+
+        final Client client = new Client();
         mProgressIndicator = ProgressDialog.show(
                 this,
                 host.name,
                 getString(R.string.footer_connecting),
                 true,
                 true,
                 new DialogInterface.OnCancelListener() {
                     @Override
                     public void onCancel(DialogInterface dialog) {
-                        JniInterface.disconnectFromHost();
+                        client.destroy();
                     }
                 });
-        SessionConnector connector = new SessionConnector(this, this, mHostListLoader);
-        mAuthenticator = new SessionAuthenticator(this, host);
+        SessionConnector connector = new SessionConnector(client, this, this, mHostListLoader);
+        mAuthenticator = new SessionAuthenticator(this, client, host);
         connector.connectToHost(mAccount, mToken, host, mAuthenticator);
     }
 
     private void refreshHostList() {
         if (mWaitingForAuthToken) {
             return;
         }
 
         mTriedNewAuthToken = false;
         setHostListProgressVisible(true);
@@ skipping 149 matching lines @@
                 // Unreachable, but required by Google Java style and findbugs.
                 assert false : "Unreached";
         }
 
         if (dismissProgress && mProgressIndicator != null) {
             mProgressIndicator.dismiss();
             mProgressIndicator = null;
         }
     }
 }