Chromoting: Synchronize connected/disconnected state between Java/C++

remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.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.jni;
 
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ skipping 188 matching lines @@
         synchronized (sFrameLock) {
             sFrameBitmap = null;
         }
     }
 
     /** Performs the native portion of the cleanup. */
     private static native void nativeDisconnect();
 
     /** Reports whenever the connection status changes. Called on the UI thread. */
     @CalledByNative
-    private static void reportConnectionStatus(int state, int error) {
-        sConnectionListener.onConnectionState(ConnectionListener.State.fromValue(state),
-                ConnectionListener.Error.fromValue(error));
+    private static void reportConnectionStatus(int stateCode, int errorCode) {
+        ConnectionListener.State state = ConnectionListener.State.fromValue(stateCode);
+        ConnectionListener.Error error = ConnectionListener.Error.fromValue(errorCode);
+        switch (state) {

[Sergey Ulanov, 2014/07/24 02:47:02]

Don't really need switch statement here. if would be sufficient.

[Lambros, 2014/07/26 00:42:35]

Done.

+            case FAILED:
+            case CLOSED:
+                // Clear the flag here, otherwise the next time connectToHost() is called, it will
+                // try to disconnect, triggering an incorrect status notification.
+                sConnected = false;
+                break;
+            default:
+                break;
+        }
+        sConnectionListener.onConnectionState(state, error);
     }
 
     /** Prompts the user to enter a PIN. Called on the UI thread. */
     @CalledByNative
     private static void displayAuthenticationPrompt(boolean pairingSupported) {
         AlertDialog.Builder pinPrompt = new AlertDialog.Builder(sContext);
         pinPrompt.setTitle(sContext.getString(R.string.title_authenticate));
         pinPrompt.setMessage(sContext.getString(R.string.pin_message_android));
         pinPrompt.setIcon(android.R.drawable.ic_lock_lock);
 
@@ skipping 230 matching lines @@
     public static void fetchThirdPartyToken(String tokenUrl, String clientId, String scope) {
         Chromoting app = (Chromoting) sContext;
         app.fetchThirdPartyToken(tokenUrl, clientId, scope);
     }
 
     /**
      * Notify the native code to continue authentication with the |token| and the |sharedSecret|.
      */
     public static native void nativeOnThirdPartyTokenFetched(String token, String sharedSecret);
 }