From 05ea2b39e0f6798da1f8a7faca8d818230d07aae Mon Sep 17 00:00:00 2001 From: Diogo Real Date: Thu, 31 Aug 2017 00:12:58 -0700 Subject: [PATCH] Deprecate IceServer constructors and update dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:8176 Change-Id: I2ebc0edf1776c49c202a181d7597099e9242c0e7 Reviewed-on: https://chromium-review.googlesource.com/642710 Commit-Queue: Diogo Real Reviewed-by: Sami Kalliomäki Cr-Commit-Position: refs/heads/master@{#19621} --- .../org/appspot/apprtc/RoomParametersFetcher.java | 13 +++++++++++-- .../sdk/android/api/org/webrtc/PeerConnection.java | 4 ++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/RoomParametersFetcher.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/RoomParametersFetcher.java index 706f365a3e..1556a69bc0 100644 --- a/webrtc/examples/androidapp/src/org/appspot/apprtc/RoomParametersFetcher.java +++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/RoomParametersFetcher.java @@ -187,7 +187,12 @@ public class RoomParametersFetcher { String credential = server.has("credential") ? server.getString("credential") : ""; for (int j = 0; j < turnUrls.length(); j++) { String turnUrl = turnUrls.getString(j); - turnServers.add(new PeerConnection.IceServer(turnUrl, username, credential)); + PeerConnection.IceServer turnServer = + PeerConnection.IceServer.builder(turnUrl) + .setUsername(username) + .setPassword(credential) + .createIceServer(); + turnServers.add(turnServer); } } return turnServers; @@ -204,7 +209,11 @@ public class RoomParametersFetcher { JSONObject server = servers.getJSONObject(i); String url = server.getString("urls"); String credential = server.has("credential") ? server.getString("credential") : ""; - ret.add(new PeerConnection.IceServer(url, "", credential)); + PeerConnection.IceServer turnServer = + PeerConnection.IceServer.builder(url) + .setPassword(credential) + .createIceServer(); + ret.add(turnServer); } return ret; } diff --git a/webrtc/sdk/android/api/org/webrtc/PeerConnection.java b/webrtc/sdk/android/api/org/webrtc/PeerConnection.java index ce9a110c8f..8322410974 100644 --- a/webrtc/sdk/android/api/org/webrtc/PeerConnection.java +++ b/webrtc/sdk/android/api/org/webrtc/PeerConnection.java @@ -114,18 +114,22 @@ public class PeerConnection { public final List tlsAlpnProtocols; /** Convenience constructor for STUN servers. */ + @Deprecated public IceServer(String uri) { this(uri, "", ""); } + @Deprecated public IceServer(String uri, String username, String password) { this(uri, username, password, TlsCertPolicy.TLS_CERT_POLICY_SECURE); } + @Deprecated public IceServer(String uri, String username, String password, TlsCertPolicy tlsCertPolicy) { this(uri, username, password, tlsCertPolicy, ""); } + @Deprecated public IceServer(String uri, String username, String password, TlsCertPolicy tlsCertPolicy, String hostname) { this(uri, username, password, tlsCertPolicy, hostname, null);