Android Chromoting: Don't auto-reconnect if connection was established.

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

 // Copyright 2014 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 org.chromium.chromoting.jni.JniInterface;
 
 /**
  * This class manages making a connection to a host, with logic for reloading the host list and
  * retrying the connection in the case of a stale host JID.
  */
 public class SessionConnector implements JniInterface.ConnectionListener,
         HostListLoader.Callback {
     private JniInterface.ConnectionListener mConnectionCallback;
     private HostListLoader.Callback mHostListCallback;
     private HostListLoader mHostListLoader;
 
     private String mAccountName;
     private String mAuthToken;
 
     /** Used to find the HostInfo from the returned array after the host list is reloaded. */
     private String mHostId;
 
     private String mHostJabberId;
 
     /**
+     * Tracks whether the connection has been established. Auto-reloading and reconnecting should
+     * only happen if connection has not yet occurred.
+     */
+    private boolean mConnected;
+
+    /**
      * @param connectionCallback Object to be notified on connection success/failure.
      * @param hostListCallback Object to be notified whenever the host list is reloaded.
      * @param hostListLoader The object used for reloading the host list.
      */
     public SessionConnector(JniInterface.ConnectionListener connectionCallback,
             HostListLoader.Callback hostListCallback, HostListLoader hostListLoader) {
         mConnectionCallback = connectionCallback;
         mHostListCallback = hostListCallback;
         mHostListLoader = hostListLoader;
     }
@@ skipping 20 matching lines @@
         return host.jabberId.isEmpty() || host.publicKey.isEmpty();
     }
 
     private void reloadHostListAndConnect() {
         mHostListLoader.retrieveHostList(mAuthToken, this);
     }
 
     @Override
     public void onConnectionState(JniInterface.ConnectionListener.State state,
             JniInterface.ConnectionListener.Error error) {
-        if (state == JniInterface.ConnectionListener.State.FAILED
+        boolean connected = mConnected;
+        mConnected = (state == JniInterface.ConnectionListener.State.CONNECTED);
+
+        if (!connected && state == JniInterface.ConnectionListener.State.FAILED
                 && error == JniInterface.ConnectionListener.Error.PEER_IS_OFFLINE) {
             // The host is offline, which may mean the JID is out of date, so refresh the host list
             // and try to connect again.
             reloadHostListAndConnect();
         } else {
             // Pass the state/error back to the caller.
             mConnectionCallback.onConnectionState(state, error);
         }
     }
 
@@ skipping 29 matching lines @@
         // Connection failed and reloading the host list also failed, so report the connection
         // error.
         mConnectionCallback.onConnectionState(JniInterface.ConnectionListener.State.FAILED,
                 JniInterface.ConnectionListener.Error.PEER_IS_OFFLINE);
 
         // Notify the caller that the host list failed to load, so the UI is updated accordingly.
         // The currently-displayed host list is not likely to be valid any more.
         mHostListCallback.onError(error);
     }
 }