From f0a539b0c8f6ff7ab69ea5009806068420296c4c Mon Sep 17 00:00:00 2001 From: deadbeef Date: Tue, 14 Feb 2017 14:13:56 -0800 Subject: [PATCH] Revert of Add the url attribute to the IceCandidate (Java Wrapper) (patchset #4 id:120001 of https://codereview.webrtc.org/2690593002/ ) Reason for revert: Breaks AppRTCMobile interoperability. The ICE candidate URL shouldn't be signaled between endpoints, it's only there for informational purposes. Original issue's description: > Add the url attribute to the IceCandidate (Java Wrapper) > > The url of the ICE server is added to the IceCandiate class. > This can be used to tell which server this candidate was gathered from. > > BUG=webrtc:7128 > > Review-Url: https://codereview.webrtc.org/2690593002 > Cr-Original-Commit-Position: refs/heads/master@{#16593} > Committed: https://chromium.googlesource.com/external/webrtc/+/8586c8ee88bfbf97dd310efb2034ac4e125d4865 > Review-Url: https://codereview.webrtc.org/2690593002 > Cr-Commit-Position: refs/heads/master@{#16615} > Committed: https://chromium.googlesource.com/external/webrtc/+/45efce01c76b2bd801a68ba58a4bbe85cdc2aa23 TBR=magjed@webrtc.org,zhihuang@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7128 Review-Url: https://codereview.webrtc.org/2699533002 Cr-Commit-Position: refs/heads/master@{#16616} --- .../src/org/appspot/apprtc/DirectRTCClient.java | 6 ++---- .../org/appspot/apprtc/RoomParametersFetcher.java | 4 ++-- .../src/org/appspot/apprtc/WebSocketRTCClient.java | 5 ++--- .../src/org/appspot/apprtc/DirectRTCClientTest.java | 3 +-- webrtc/sdk/android/api/org/webrtc/IceCandidate.java | 12 +----------- webrtc/sdk/android/src/jni/peerconnection_jni.cc | 12 ++++-------- 6 files changed, 12 insertions(+), 30 deletions(-) diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/DirectRTCClient.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/DirectRTCClient.java index 6d143b92bf..199979f61b 100644 --- a/webrtc/examples/androidapp/src/org/appspot/apprtc/DirectRTCClient.java +++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/DirectRTCClient.java @@ -187,7 +187,6 @@ public class DirectRTCClient implements AppRTCClient, TCPChannelClient.TCPChanne jsonPut(json, "label", candidate.sdpMLineIndex); jsonPut(json, "id", candidate.sdpMid); jsonPut(json, "candidate", candidate.sdp); - jsonPut(json, "url", candidate.serverUrl); if (roomState != ConnectionState.CONNECTED) { reportError("Sending ICE candidate in non connected state."); @@ -337,13 +336,12 @@ public class DirectRTCClient implements AppRTCClient, TCPChannelClient.TCPChanne jsonPut(json, "label", candidate.sdpMLineIndex); jsonPut(json, "id", candidate.sdpMid); jsonPut(json, "candidate", candidate.sdp); - jsonPut(json, "url", candidate.serverUrl); return json; } // Converts a JSON candidate to a Java object. private static IceCandidate toJavaCandidate(JSONObject json) throws JSONException { - return new IceCandidate(json.getString("id"), json.getInt("label"), json.getString("candidate"), - json.getString("url")); + return new IceCandidate( + json.getString("id"), json.getInt("label"), json.getString("candidate")); } } diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/RoomParametersFetcher.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/RoomParametersFetcher.java index 48651099f0..f79154c29f 100644 --- a/webrtc/examples/androidapp/src/org/appspot/apprtc/RoomParametersFetcher.java +++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/RoomParametersFetcher.java @@ -115,8 +115,8 @@ public class RoomParametersFetcher { offerSdp = new SessionDescription( SessionDescription.Type.fromCanonicalForm(messageType), message.getString("sdp")); } else if (messageType.equals("candidate")) { - IceCandidate candidate = new IceCandidate(message.getString("id"), - message.getInt("label"), message.getString("candidate"), message.getString("url")); + IceCandidate candidate = new IceCandidate( + message.getString("id"), message.getInt("label"), message.getString("candidate")); iceCandidates.add(candidate); } else { Log.e(TAG, "Unknown message: " + messageString); diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java index 50a7a35e49..28eef2e51e 100644 --- a/webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java +++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java @@ -408,13 +408,12 @@ public class WebSocketRTCClient implements AppRTCClient, WebSocketChannelEvents jsonPut(json, "label", candidate.sdpMLineIndex); jsonPut(json, "id", candidate.sdpMid); jsonPut(json, "candidate", candidate.sdp); - jsonPut(json, "url", candidate.serverUrl); return json; } // Converts a JSON candidate to a Java object. IceCandidate toJavaCandidate(JSONObject json) throws JSONException { - return new IceCandidate(json.getString("id"), json.getInt("label"), json.getString("candidate"), - json.getString("url")); + return new IceCandidate( + json.getString("id"), json.getInt("label"), json.getString("candidate")); } } diff --git a/webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java b/webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java index 7ad50c38d9..2da8164ec7 100644 --- a/webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java +++ b/webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java @@ -41,7 +41,6 @@ public class DirectRTCClientTest { private static final String DUMMY_SDP_MID = "sdpMid"; private static final String DUMMY_SDP = "sdp"; - private static final String DUMMY_SERVER_URL = "serverUrl"; public static final int SERVER_WAIT = 100; public static final int NETWORK_TIMEOUT = 1000; @@ -137,7 +136,7 @@ public class DirectRTCClientTest { verify(serverEvents, timeout(NETWORK_TIMEOUT)) .onRemoteDescription(isNotNull(SessionDescription.class)); - IceCandidate candidate = new IceCandidate(DUMMY_SDP_MID, 0, DUMMY_SDP, DUMMY_SERVER_URL); + IceCandidate candidate = new IceCandidate(DUMMY_SDP_MID, 0, DUMMY_SDP); server.sendLocalIceCandidate(candidate); verify(clientEvents, timeout(NETWORK_TIMEOUT)) .onRemoteIceCandidate(isNotNull(IceCandidate.class)); diff --git a/webrtc/sdk/android/api/org/webrtc/IceCandidate.java b/webrtc/sdk/android/api/org/webrtc/IceCandidate.java index 5080643181..3476ab4f19 100644 --- a/webrtc/sdk/android/api/org/webrtc/IceCandidate.java +++ b/webrtc/sdk/android/api/org/webrtc/IceCandidate.java @@ -18,24 +18,14 @@ public class IceCandidate { public final String sdpMid; public final int sdpMLineIndex; public final String sdp; - public final String serverUrl; - @Deprecated public IceCandidate(String sdpMid, int sdpMLineIndex, String sdp) { this.sdpMid = sdpMid; this.sdpMLineIndex = sdpMLineIndex; this.sdp = sdp; - this.serverUrl = ""; - } - - public IceCandidate(String sdpMid, int sdpMLineIndex, String sdp, String serverUrl) { - this.sdpMid = sdpMid; - this.sdpMLineIndex = sdpMLineIndex; - this.sdp = sdp; - this.serverUrl = serverUrl; } public String toString() { - return sdpMid + ":" + sdpMLineIndex + ":" + sdp + ":" + serverUrl; + return sdpMid + ":" + sdpMLineIndex + ":" + sdp; } } diff --git a/webrtc/sdk/android/src/jni/peerconnection_jni.cc b/webrtc/sdk/android/src/jni/peerconnection_jni.cc index dfc1090463..d3f23445d6 100644 --- a/webrtc/sdk/android/src/jni/peerconnection_jni.cc +++ b/webrtc/sdk/android/src/jni/peerconnection_jni.cc @@ -245,16 +245,12 @@ class PCOJava : public PeerConnectionObserver { std::string sdp; RTC_CHECK(candidate->ToString(&sdp)) << "got so far: " << sdp; jclass candidate_class = FindClass(jni(), "org/webrtc/IceCandidate"); - jmethodID ctor = GetMethodID( - jni(), candidate_class, "", - "(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V"); + jmethodID ctor = GetMethodID(jni(), candidate_class, + "", "(Ljava/lang/String;ILjava/lang/String;)V"); jstring j_mid = JavaStringFromStdString(jni(), candidate->sdp_mid()); jstring j_sdp = JavaStringFromStdString(jni(), sdp); - jstring j_url = - JavaStringFromStdString(jni(), candidate->candidate().url()); - jobject j_candidate = - jni()->NewObject(candidate_class, ctor, j_mid, - candidate->sdp_mline_index(), j_sdp, j_url); + jobject j_candidate = jni()->NewObject(candidate_class, ctor, j_mid, + candidate->sdp_mline_index(), j_sdp); CHECK_EXCEPTION(jni()) << "error during NewObject"; jmethodID m = GetMethodID(jni(), *j_observer_class_, "onIceCandidate", "(Lorg/webrtc/IceCandidate;)V");