Index: remoting/client/jni/jni_client.cc |
diff --git a/remoting/client/jni/jni_client.cc b/remoting/client/jni/jni_client.cc |
index aaa03b71788bb4b675c1137db4e14e95a86745bb..2175cecf45109ce9b1f10a2005ae7f796c2d08f5 100644 |
--- a/remoting/client/jni/jni_client.cc |
+++ b/remoting/client/jni/jni_client.cc |
@@ -10,6 +10,7 @@ |
#include "jni/Client_jni.h" |
#include "remoting/client/jni/chromoting_jni_instance.h" |
#include "remoting/client/jni/chromoting_jni_runtime.h" |
+#include "remoting/client/jni/connect_to_host_info.h" |
#include "remoting/client/jni/jni_gl_display_handler.h" |
#include "remoting/client/jni/jni_pairing_secret_fetcher.h" |
#include "remoting/client/jni/jni_touch_event_data.h" |
@@ -38,35 +39,18 @@ JniClient::~JniClient() { |
DisconnectFromHost(); |
} |
-void JniClient::ConnectToHost(const std::string& username, |
- const std::string& auth_token, |
- const std::string& host_jid, |
- const std::string& host_id, |
- const std::string& host_pubkey, |
- const std::string& pairing_id, |
- const std::string& pairing_secret, |
- const std::string& capabilities, |
- const std::string& flags, |
- const std::string& host_version, |
- const std::string& host_os, |
- const std::string& host_os_version) { |
+void JniClient::ConnectToHost(const ConnectToHostInfo& info) { |
DCHECK(runtime_->ui_task_runner()->BelongsToCurrentThread()); |
DCHECK(!display_handler_); |
DCHECK(!session_); |
DCHECK(!secret_fetcher_); |
display_handler_.reset(new JniGlDisplayHandler(runtime_, java_client_)); |
- secret_fetcher_.reset(new JniPairingSecretFetcher(runtime_, GetWeakPtr(), |
- host_id)); |
- // TODO(BUG 680752): Create ClientTelemetryLogger here. No need to pass host |
- // info all the way down. Currently we have to do that due to thread |
- // restriction. |
+ secret_fetcher_.reset( |
+ new JniPairingSecretFetcher(runtime_, GetWeakPtr(), info.host_id)); |
session_.reset(new ChromotingJniInstance( |
runtime_, GetWeakPtr(), secret_fetcher_->GetWeakPtr(), |
display_handler_->CreateCursorShapeStub(), |
- display_handler_->CreateVideoRenderer(), |
- username, auth_token, host_jid, host_id, |
- host_pubkey, pairing_id, pairing_secret, capabilities, flags, |
- host_version, host_os, host_os_version)); |
+ display_handler_->CreateVideoRenderer(), info)); |
session_->Connect(); |
} |
@@ -158,29 +142,31 @@ void JniClient::Connect( |
JNIEnv* env, |
const base::android::JavaParamRef<jobject>& caller, |
const base::android::JavaParamRef<jstring>& username, |
- const base::android::JavaParamRef<jstring>& authToken, |
- const base::android::JavaParamRef<jstring>& hostJid, |
- const base::android::JavaParamRef<jstring>& hostId, |
- const base::android::JavaParamRef<jstring>& hostPubkey, |
- const base::android::JavaParamRef<jstring>& pairId, |
- const base::android::JavaParamRef<jstring>& pairSecret, |
+ const base::android::JavaParamRef<jstring>& auth_token, |
+ const base::android::JavaParamRef<jstring>& host_jid, |
+ const base::android::JavaParamRef<jstring>& host_id, |
+ const base::android::JavaParamRef<jstring>& host_pubkey, |
+ const base::android::JavaParamRef<jstring>& pair_id, |
+ const base::android::JavaParamRef<jstring>& pair_secret, |
const base::android::JavaParamRef<jstring>& capabilities, |
const base::android::JavaParamRef<jstring>& flags, |
const base::android::JavaParamRef<jstring>& host_version, |
const base::android::JavaParamRef<jstring>& host_os, |
const base::android::JavaParamRef<jstring>& host_os_version) { |
- ConnectToHost(ConvertJavaStringToUTF8(env, username), |
- ConvertJavaStringToUTF8(env, authToken), |
- ConvertJavaStringToUTF8(env, hostJid), |
- ConvertJavaStringToUTF8(env, hostId), |
- ConvertJavaStringToUTF8(env, hostPubkey), |
- ConvertJavaStringToUTF8(env, pairId), |
- ConvertJavaStringToUTF8(env, pairSecret), |
- ConvertJavaStringToUTF8(env, capabilities), |
- ConvertJavaStringToUTF8(env, flags), |
- ConvertJavaStringToUTF8(env, host_version), |
- ConvertJavaStringToUTF8(env, host_os), |
- ConvertJavaStringToUTF8(env, host_os_version)); |
+ ConnectToHostInfo info; |
+ info.username = ConvertJavaStringToUTF8(env, username); |
+ info.auth_token = ConvertJavaStringToUTF8(env, auth_token); |
+ info.host_jid = ConvertJavaStringToUTF8(env, host_jid); |
+ info.host_id = ConvertJavaStringToUTF8(env, host_id); |
+ info.host_pubkey = ConvertJavaStringToUTF8(env, host_pubkey); |
+ info.pairing_id = ConvertJavaStringToUTF8(env, pair_id); |
+ info.pairing_secret = ConvertJavaStringToUTF8(env, pair_secret); |
+ info.capabilities = ConvertJavaStringToUTF8(env, capabilities); |
+ info.flags = ConvertJavaStringToUTF8(env, flags); |
+ info.host_version = ConvertJavaStringToUTF8(env, host_version); |
+ info.host_os = ConvertJavaStringToUTF8(env, host_os); |
+ info.host_os_version = ConvertJavaStringToUTF8(env, host_os_version); |
+ ConnectToHost(info); |
} |
void JniClient::Disconnect(JNIEnv* env, |