android: add IceServer.urls field

webrtc/sdk/android/src/jni/pc/java_native_conversion.cc

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..8bfc42c69ac50433ceb74b3f12f5d3eb970e9c49 100644
--- a/webrtc/sdk/android/src/jni/pc/java_native_conversion.cc
+++ b/webrtc/sdk/android/src/jni/pc/java_native_conversion.cc
@@ -351,6 +351,8 @@ void JavaToNativeIceServers(JNIEnv* jni,
     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 =
@@ -365,7 +367,9 @@ void JavaToNativeIceServers(JNIEnv* jni,
     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));
+        GetNullableObjectField(jni, j_ice_server, j_ice_server_uri_id));
+    jstring urls = reinterpret_cast<jstring>(
+        GetNullableObjectField(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 +381,13 @@ 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);
+    if (urls != nullptr) {
+      server.urls = JavaToStdVectorStrings(jni, urls);
+    } else if (uri != nullptr) {
+      server.uri = JavaToStdString(jni, uri);

[sakal, 2017/09/07 07:46:36]

Just ignore the uri paramater and set server.uri to the first of the urls.

[korniltsev, 2017/09/07 20:33:46]

Done.

+    } else {
+      RTC_NOTREACHED();
+    }
     server.username = JavaToStdString(jni, username);
     server.password = JavaToStdString(jni, password);
     server.tls_cert_policy = tls_cert_policy;