Index: webrtc/sdk/android/src/jni/pc/java_native_conversion.cc |
diff --git a/webrtc/sdk/android/src/jni/pc/java_native_conversion.cc b/webrtc/sdk/android/src/jni/pc/java_native_conversion.cc |
index 799f67dbcefa16dff98f6068cce81ae7cba7c7fc..a406b0be02a033d53e59c7df2fe25cc72cb75bb0 100644 |
--- a/webrtc/sdk/android/src/jni/pc/java_native_conversion.cc |
+++ b/webrtc/sdk/android/src/jni/pc/java_native_conversion.cc |
@@ -349,8 +349,8 @@ void JavaToNativeIceServers(JNIEnv* jni, |
PeerConnectionInterface::IceServers* ice_servers) { |
for (jobject j_ice_server : Iterable(jni, j_ice_servers)) { |
jclass j_ice_server_class = GetObjectClass(jni, j_ice_server); |
- jfieldID j_ice_server_uri_id = |
- GetFieldID(jni, j_ice_server_class, "uri", "Ljava/lang/String;"); |
+ jfieldID j_ice_server_urls_id = |
+ GetFieldID(jni, j_ice_server_class, "urls", "Ljava/util/List;"); |
jfieldID j_ice_server_username_id = |
GetFieldID(jni, j_ice_server_class, "username", "Ljava/lang/String;"); |
jfieldID j_ice_server_password_id = |
@@ -364,8 +364,8 @@ void JavaToNativeIceServers(JNIEnv* jni, |
GetFieldID(jni, j_ice_server_class, "hostname", "Ljava/lang/String;"); |
jfieldID j_ice_server_tls_alpn_protocols_id = GetFieldID( |
jni, j_ice_server_class, "tlsAlpnProtocols", "Ljava/util/List;"); |
- jstring uri = reinterpret_cast<jstring>( |
- GetObjectField(jni, j_ice_server, j_ice_server_uri_id)); |
+ jstring urls = reinterpret_cast<jstring>( |
+ GetObjectField(jni, j_ice_server, j_ice_server_urls_id)); |
jstring username = reinterpret_cast<jstring>( |
GetObjectField(jni, j_ice_server, j_ice_server_username_id)); |
jstring password = reinterpret_cast<jstring>( |
@@ -377,7 +377,7 @@ void JavaToNativeIceServers(JNIEnv* jni, |
jobject tls_alpn_protocols = GetNullableObjectField( |
jni, j_ice_server, j_ice_server_tls_alpn_protocols_id); |
PeerConnectionInterface::IceServer server; |
- server.uri = JavaToStdString(jni, uri); |
+ server.urls = JavaToStdVectorStrings(jni, urls); |
sakal
2017/09/08 08:22:55
Is it safe to not set server.uri at all or should
korniltsev
2017/09/08 16:20:20
At first we try to parse urls, if it is empty then
sakal
2017/09/11 11:13:08
Acknowledged.
|
server.username = JavaToStdString(jni, username); |
server.password = JavaToStdString(jni, password); |
server.tls_cert_policy = tls_cert_policy; |