OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "remoting/client/jni/jni_client.h" | 5 #include "remoting/client/jni/jni_client.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "jni/Client_jni.h" | 10 #include "jni/Client_jni.h" |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 runtime_->display_task_runner()->DeleteSoon(FROM_HERE, | 79 runtime_->display_task_runner()->DeleteSoon(FROM_HERE, |
80 display_handler_.release()); | 80 display_handler_.release()); |
81 } | 81 } |
82 } | 82 } |
83 | 83 |
84 void JniClient::OnConnectionState(protocol::ConnectionToHost::State state, | 84 void JniClient::OnConnectionState(protocol::ConnectionToHost::State state, |
85 protocol::ErrorCode error) { | 85 protocol::ErrorCode error) { |
86 DCHECK(runtime_->ui_task_runner()->BelongsToCurrentThread()); | 86 DCHECK(runtime_->ui_task_runner()->BelongsToCurrentThread()); |
87 | 87 |
88 JNIEnv* env = base::android::AttachCurrentThread(); | 88 JNIEnv* env = base::android::AttachCurrentThread(); |
89 Java_Client_onConnectionState(env, java_client_.obj(), state, error); | 89 Java_Client_onConnectionState(env, java_client_, state, error); |
90 } | 90 } |
91 | 91 |
92 void JniClient::DisplayAuthenticationPrompt(bool pairing_supported) { | 92 void JniClient::DisplayAuthenticationPrompt(bool pairing_supported) { |
93 DCHECK(runtime_->ui_task_runner()->BelongsToCurrentThread()); | 93 DCHECK(runtime_->ui_task_runner()->BelongsToCurrentThread()); |
94 | 94 |
95 JNIEnv* env = base::android::AttachCurrentThread(); | 95 JNIEnv* env = base::android::AttachCurrentThread(); |
96 Java_Client_displayAuthenticationPrompt(env, java_client_.obj(), | 96 Java_Client_displayAuthenticationPrompt(env, java_client_, pairing_supported); |
97 pairing_supported); | |
98 } | 97 } |
99 | 98 |
100 void JniClient::CommitPairingCredentials(const std::string& host, | 99 void JniClient::CommitPairingCredentials(const std::string& host, |
101 const std::string& id, | 100 const std::string& id, |
102 const std::string& secret) { | 101 const std::string& secret) { |
103 DCHECK(runtime_->ui_task_runner()->BelongsToCurrentThread()); | 102 DCHECK(runtime_->ui_task_runner()->BelongsToCurrentThread()); |
104 | 103 |
105 JNIEnv* env = base::android::AttachCurrentThread(); | 104 JNIEnv* env = base::android::AttachCurrentThread(); |
106 ScopedJavaLocalRef<jstring> j_host = ConvertUTF8ToJavaString(env, host); | 105 ScopedJavaLocalRef<jstring> j_host = ConvertUTF8ToJavaString(env, host); |
107 ScopedJavaLocalRef<jstring> j_id = ConvertUTF8ToJavaString(env, id); | 106 ScopedJavaLocalRef<jstring> j_id = ConvertUTF8ToJavaString(env, id); |
108 ScopedJavaLocalRef<jstring> j_secret = ConvertUTF8ToJavaString(env, secret); | 107 ScopedJavaLocalRef<jstring> j_secret = ConvertUTF8ToJavaString(env, secret); |
109 | 108 |
110 Java_Client_commitPairingCredentials(env, java_client_.obj(), j_host.obj(), | 109 Java_Client_commitPairingCredentials(env, java_client_, j_host, j_id, |
111 j_id.obj(), j_secret.obj()); | 110 j_secret); |
112 } | 111 } |
113 | 112 |
114 void JniClient::FetchThirdPartyToken(const std::string& token_url, | 113 void JniClient::FetchThirdPartyToken(const std::string& token_url, |
115 const std::string& client_id, | 114 const std::string& client_id, |
116 const std::string& scope) { | 115 const std::string& scope) { |
117 DCHECK(runtime_->ui_task_runner()->BelongsToCurrentThread()); | 116 DCHECK(runtime_->ui_task_runner()->BelongsToCurrentThread()); |
118 JNIEnv* env = base::android::AttachCurrentThread(); | 117 JNIEnv* env = base::android::AttachCurrentThread(); |
119 | 118 |
120 ScopedJavaLocalRef<jstring> j_url = ConvertUTF8ToJavaString(env, token_url); | 119 ScopedJavaLocalRef<jstring> j_url = ConvertUTF8ToJavaString(env, token_url); |
121 ScopedJavaLocalRef<jstring> j_client_id = | 120 ScopedJavaLocalRef<jstring> j_client_id = |
122 ConvertUTF8ToJavaString(env, client_id); | 121 ConvertUTF8ToJavaString(env, client_id); |
123 ScopedJavaLocalRef<jstring> j_scope = ConvertUTF8ToJavaString(env, scope); | 122 ScopedJavaLocalRef<jstring> j_scope = ConvertUTF8ToJavaString(env, scope); |
124 | 123 |
125 Java_Client_fetchThirdPartyToken(env, java_client_.obj(), j_url.obj(), | 124 Java_Client_fetchThirdPartyToken(env, java_client_, j_url, j_client_id, |
126 j_client_id.obj(), j_scope.obj()); | 125 j_scope); |
127 } | 126 } |
128 | 127 |
129 void JniClient::SetCapabilities(const std::string& capabilities) { | 128 void JniClient::SetCapabilities(const std::string& capabilities) { |
130 DCHECK(runtime_->ui_task_runner()->BelongsToCurrentThread()); | 129 DCHECK(runtime_->ui_task_runner()->BelongsToCurrentThread()); |
131 JNIEnv* env = base::android::AttachCurrentThread(); | 130 JNIEnv* env = base::android::AttachCurrentThread(); |
132 | 131 |
133 ScopedJavaLocalRef<jstring> j_cap = | 132 ScopedJavaLocalRef<jstring> j_cap = |
134 ConvertUTF8ToJavaString(env, capabilities); | 133 ConvertUTF8ToJavaString(env, capabilities); |
135 | 134 |
136 Java_Client_setCapabilities(env, java_client_.obj(), j_cap.obj()); | 135 Java_Client_setCapabilities(env, java_client_, j_cap); |
137 } | 136 } |
138 | 137 |
139 void JniClient::HandleExtensionMessage(const std::string& type, | 138 void JniClient::HandleExtensionMessage(const std::string& type, |
140 const std::string& message) { | 139 const std::string& message) { |
141 DCHECK(runtime_->ui_task_runner()->BelongsToCurrentThread()); | 140 DCHECK(runtime_->ui_task_runner()->BelongsToCurrentThread()); |
142 JNIEnv* env = base::android::AttachCurrentThread(); | 141 JNIEnv* env = base::android::AttachCurrentThread(); |
143 | 142 |
144 ScopedJavaLocalRef<jstring> j_type = ConvertUTF8ToJavaString(env, type); | 143 ScopedJavaLocalRef<jstring> j_type = ConvertUTF8ToJavaString(env, type); |
145 ScopedJavaLocalRef<jstring> j_message = ConvertUTF8ToJavaString(env, message); | 144 ScopedJavaLocalRef<jstring> j_message = ConvertUTF8ToJavaString(env, message); |
146 | 145 |
147 Java_Client_handleExtensionMessage(env, java_client_.obj(), j_type.obj(), | 146 Java_Client_handleExtensionMessage(env, java_client_, j_type, j_message); |
148 j_message.obj()); | |
149 } | 147 } |
150 | 148 |
151 // static | 149 // static |
152 bool JniClient::RegisterJni(JNIEnv* env) { | 150 bool JniClient::RegisterJni(JNIEnv* env) { |
153 return RegisterNativesImpl(env); | 151 return RegisterNativesImpl(env); |
154 } | 152 } |
155 | 153 |
156 void JniClient::Connect( | 154 void JniClient::Connect( |
157 JNIEnv* env, | 155 JNIEnv* env, |
158 const base::android::JavaParamRef<jobject>& caller, | 156 const base::android::JavaParamRef<jobject>& caller, |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
300 return weak_ptr_; | 298 return weak_ptr_; |
301 } | 299 } |
302 | 300 |
303 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& caller) { | 301 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& caller) { |
304 return reinterpret_cast<intptr_t>( | 302 return reinterpret_cast<intptr_t>( |
305 new JniClient(ChromotingJniRuntime::GetInstance(), | 303 new JniClient(ChromotingJniRuntime::GetInstance(), |
306 base::android::ScopedJavaGlobalRef<jobject>(env, caller))); | 304 base::android::ScopedJavaGlobalRef<jobject>(env, caller))); |
307 } | 305 } |
308 | 306 |
309 } // namespace remoting | 307 } // namespace remoting |
OLD | NEW |