Propagate connection info to Blimp android UI.

blimp/client/core/settings/android/blimp_settings_android.cc

 // Copyright 2016 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.
 
 #include "blimp/client/core/settings/android/blimp_settings_android.h"
 
+#include "base/android/jni_string.h"
+#include "base/bind.h"
+#include "blimp/client/core/session/connection_status.h"
+#include "blimp/client/core/settings/blimp_settings_delegate.h"
 #include "blimp/client/public/blimp_client_context.h"
 #include "jni/AboutBlimpPreferences_jni.h"
 
 namespace blimp {
 namespace client {
 
 // static
 bool BlimpSettingsAndroid::RegisterJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
 BlimpSettingsAndroid* BlimpSettingsAndroid::FromJavaObject(JNIEnv* env,
                                                            jobject jobj) {
   return reinterpret_cast<BlimpSettingsAndroid*>(
       Java_AboutBlimpPreferences_getNativePtr(env, jobj));
 }
 
 static jlong Init(JNIEnv* env,
                   const base::android::JavaParamRef<jobject>& jobj) {
   return reinterpret_cast<intptr_t>(new BlimpSettingsAndroid(env, jobj));
 }
 
-BlimpSettingsAndroid::BlimpSettingsAndroid(JNIEnv* env, jobject jobj)
-    : identity_source_(nullptr) {
+BlimpSettingsAndroid::BlimpSettingsAndroid(JNIEnv* env, jobject jobj) {

[David Trainor- moved to gerrit, 2016/09/13 05:54:51]

delegate_(nullptr)?

[xingliu, 2016/09/13 18:36:15]

Done. Did it in the header, but put it here seems to be faster for compiling.

   java_obj_.Reset(env, jobj);
 }
 
 BlimpSettingsAndroid::~BlimpSettingsAndroid() {
   Java_AboutBlimpPreferences_clearNativePtr(
       base::android::AttachCurrentThread(), java_obj_);
 }
 
 void BlimpSettingsAndroid::Destroy(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& jobj) {
-  DCHECK(identity_source_);
-  identity_source_->RemoveObserver(this);
+  if (delegate_) {
+    delegate_->GetIdentitySource()->RemoveObserver(this);

[David Trainor- moved to gerrit, 2016/09/13 05:54:51]

Put this in the destructor.  Sorry for not catching this earlier.

[xingliu, 2016/09/13 18:36:15]

Done.

+    delegate_->GetConnectionStatus()->RemoveObserver(this);
+  }
+
   delete this;
 }
 
-void BlimpSettingsAndroid::SetIdentitySource(IdentitySource* identity_source) {
-  if (identity_source_) {
-    identity_source_->RemoveObserver(this);
-  }
-
-  identity_source_ = identity_source;
-  DCHECK(identity_source_);
+void BlimpSettingsAndroid::SetDelegate(BlimpSettingsDelegate* delegate) {
+  // Set the Delegate, it can only get called for once.

[David Trainor- moved to gerrit, 2016/09/13 05:54:51]

get -> be.  Remove for.  Put this comment in the header.

[xingliu, 2016/09/13 18:36:15]

Done.

+  DCHECK(!delegate_ && delegate);
+  delegate_ = delegate;
 
   // Listen to sign in state change.
-  identity_source->AddObserver(this);
+  delegate_->GetIdentitySource()->AddObserver(this);
+
+  // Listen to connection state change.
+  ConnectionStatus* conn_status = delegate_->GetConnectionStatus();
+  DCHECK(conn_status);
+  conn_status->AddObserver(this);
+
+  // Propagate connection info if the client is connected to the engine.
+  if (conn_status->IsConnected()) {
+    OnConnected();
+  }
 }
 
 void BlimpSettingsAndroid::OnSignedOut() {
   Java_AboutBlimpPreferences_onSignedOut(base::android::AttachCurrentThread(),
                                          java_obj_);
 }
 
 void BlimpSettingsAndroid::OnSignedIn() {
   Java_AboutBlimpPreferences_onSignedIn(base::android::AttachCurrentThread(),
                                         java_obj_);
 }
 
 void BlimpSettingsAndroid::OnActiveAccountLogout() {
   OnSignedOut();
 }
 
 void BlimpSettingsAndroid::OnActiveAccountLogin() {
   OnSignedIn();
 }
 
+void BlimpSettingsAndroid::OnConnected() {
+  DCHECK(delegate_);
+
+  JNIEnv* env = base::android::AttachCurrentThread();
+  std::string ip =
+      delegate_->GetConnectionStatus()->GetIpEndPoint().address().ToString();
+  base::android::ScopedJavaLocalRef<jstring> jengine_ip(
+      base::android::ConvertUTF8ToJavaString(env, ip));
+
+  Java_AboutBlimpPreferences_onConnected(env, java_obj_, jengine_ip);

[David Trainor- moved to gerrit, 2016/09/13 05:54:51]

If it's not connected can we expose the error reason here?  Maybe make it
engine_identifier instead of engine_ip?  That way an error reason makes (at
least a little) more sense when we sub it in? :)

[xingliu, 2016/09/13 18:36:15]

Done, removed Java onConnect, onDisconnect, call UpdateEngineInfo in native
instead. Also align UpdateEngineInfo with OnSignIn OnSignOut, make them private
const. Also put interface implementations into private.

+}
+
+void BlimpSettingsAndroid::OnDisconnected(int result) {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_AboutBlimpPreferences_onDisconnected(env, java_obj_);

[David Trainor- moved to gerrit, 2016/09/13 05:54:51]

Is this the same as onConnected() but with an empty string?  Can we just call
setEngineIp or setEngineIdentifier?

[xingliu, 2016/09/13 18:36:15]

Renamed it to UpdateEngineInfo..

+}
+
 }  // namespace client
 }  // namespace blimp