Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1828)

Unified Diff: remoting/host/android/jni_host.cc

Issue 2358083003: [remoting android] Remove host It2Me implementation. (Closed)
Patch Set: Update remoting/host/it2me/ Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/android/jni_host.h ('k') | remoting/host/android/remoting_host_jni_onload.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/android/jni_host.cc
diff --git a/remoting/host/android/jni_host.cc b/remoting/host/android/jni_host.cc
deleted file mode 100644
index 9e6bd7868b1c29cdc8ee8499f466de68f1dc9666..0000000000000000000000000000000000000000
--- a/remoting/host/android/jni_host.cc
+++ /dev/null
@@ -1,135 +0,0 @@
-// 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 "remoting/host/android/jni_host.h"
-
-#include "base/android/jni_string.h"
-#include "base/command_line.h"
-#include "base/strings/string_util.h"
-#include "jni/Host_jni.h"
-#include "net/base/url_util.h"
-#include "net/socket/ssl_server_socket.h"
-#include "remoting/base/auto_thread_task_runner.h"
-#include "remoting/base/logging.h"
-#include "remoting/host/chromoting_host_context.h"
-#include "remoting/host/it2me/it2me_host.h"
-#include "remoting/host/service_urls.h"
-#include "remoting/signaling/xmpp_signal_strategy.h"
-
-using base::android::ConvertJavaStringToUTF8;
-using base::android::ConvertUTF8ToJavaString;
-using base::android::JavaParamRef;
-
-namespace remoting {
-
-JniHost::JniHost(JNIEnv* env, jobject java_host) : weak_factory_(this) {
- java_host_.Reset(env, java_host);
- weak_ptr_ = weak_factory_.GetWeakPtr();
-
- base::CommandLine::Init(0, nullptr);
-
- // Enable support for SSL server sockets, which must be done while still
- // single-threaded.
- net::EnableSSLServerSockets();
-
- if (!base::MessageLoop::current()) {
- HOST_LOG << "Starting main message loop";
-
- // On Android, the UI thread is managed by Java, so we need to attach and
- // start a special type of message loop to allow Chromium code to run tasks.
- ui_loop_.reset(new base::MessageLoopForUI());
- ui_loop_->Start();
- } else {
- HOST_LOG << "Using existing main message loop";
- ui_loop_.reset(base::MessageLoopForUI::current());
- }
-
- factory_.reset(new It2MeHostFactory());
- host_context_ =
- ChromotingHostContext::Create(new remoting::AutoThreadTaskRunner(
- ui_loop_->task_runner(), base::Bind(&base::DoNothing)));
-
- const ServiceUrls* service_urls = ServiceUrls::GetInstance();
- const bool xmpp_server_valid = net::ParseHostAndPort(
- service_urls->xmpp_server_address(), &xmpp_server_config_.host,
- &xmpp_server_config_.port);
- DCHECK(xmpp_server_valid);
-
- xmpp_server_config_.use_tls = service_urls->xmpp_server_use_tls();
-}
-
-JniHost::~JniHost() {}
-
-// static
-bool JniHost::RegisterJni(JNIEnv* env) {
- return RegisterNativesImpl(env);
-}
-
-void JniHost::Destroy(JNIEnv* env, const JavaParamRef<jobject>& caller) {
- delete this;
-}
-
-void JniHost::Connect(JNIEnv* env,
- const base::android::JavaParamRef<jobject>& caller,
- const JavaParamRef<jstring>& user_name,
- const JavaParamRef<jstring>& auth_token) {
- if (it2me_host_) {
- LOG(ERROR) << "Connect: already connected.";
- return;
- }
-
- XmppSignalStrategy::XmppServerConfig xmpp_config = xmpp_server_config_;
- xmpp_config.username = ConvertJavaStringToUTF8(user_name);
- xmpp_config.auth_token = ConvertJavaStringToUTF8(auth_token);
-
- std::string directory_bot_jid =
- ServiceUrls::GetInstance()->directory_bot_jid();
-
- // Create the It2Me host and start connecting.
- it2me_host_ = factory_->CreateIt2MeHost(host_context_->Copy(),
- /*policy_service=*/nullptr, weak_ptr_,
- xmpp_config, directory_bot_jid);
- it2me_host_->Connect();
-}
-
-void JniHost::Disconnect(JNIEnv* env,
- const base::android::JavaParamRef<jobject>& caller) {
- if (it2me_host_) {
- it2me_host_->Disconnect();
- it2me_host_ = nullptr;
- }
-}
-
-void JniHost::OnClientAuthenticated(const std::string& client_username) {
- HOST_LOG << "OnClientAuthenticated: " << client_username;
-}
-
-void JniHost::OnStoreAccessCode(const std::string& access_code,
- base::TimeDelta access_code_lifetime) {
- JNIEnv* env = base::android::AttachCurrentThread();
- Java_Host_onAccessCodeReceived(
- env, java_host_, ConvertUTF8ToJavaString(env, access_code),
- static_cast<int>(access_code_lifetime.InSeconds()));
-}
-
-void JniHost::OnNatPolicyChanged(bool nat_traversal_enabled) {
- HOST_LOG << "OnNatPolicyChanged: " << nat_traversal_enabled;
-}
-
-void JniHost::OnStateChanged(It2MeHostState state,
- const std::string& error_message) {
- if (state == kDisconnected) {
- it2me_host_ = nullptr;
- }
-
- JNIEnv* env = base::android::AttachCurrentThread();
- Java_Host_onStateChanged(env, java_host_, state,
- ConvertUTF8ToJavaString(env, error_message));
-}
-
-static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& caller) {
- return reinterpret_cast<intptr_t>(new JniHost(env, caller));
-}
-
-} // namespace remoting
« no previous file with comments | « remoting/host/android/jni_host.h ('k') | remoting/host/android/remoting_host_jni_onload.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698