android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-18 20:40:58 +03:00
Code Releases Activity

Merge pull request #1298 from square/jw/no-one-used-this

Browse Source 
Remove old SSL protocol method.
This commit is contained in:
Jesse Wilson
2015-01-06 14:52:15 -05:00
parent 5f44ca768e 4ab6a8258b
commit 6f1af29142
3 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/RecordedRequest.java
View File

@@ -16,9 +16,8 @@
package com.squareup.okhttp.mockwebserver;
import com.squareup.okhttp.TlsVersion;
import com.squareup.okhttp.internal.Internal;
import com.squareup.okhttp.Headers;
import com.squareup.okhttp.TlsVersion;
import java.net.Socket;
import java.util.ArrayList;
import java.util.List;
@@ -135,11 +134,6 @@ public final class RecordedRequest {
return sequenceNumber;
}
/** @deprecated Use {@link #getTlsVersion()}. */
public String getSslProtocol() {
return tlsVersion != null ? Internal.instance.tlsVersionJavaName(tlsVersion) : null;
}
/** Returns the connection's TLS version or null if the connection doesn't use SSL. */
public TlsVersion getTlsVersion() {
return tlsVersion;

4
okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java
View File

@@ -120,10 +120,6 @@ public class OkHttpClient implements Cloneable {
connection.connectAndSetOwner(client, owner, request);
}
@Override public String tlsVersionJavaName(TlsVersion tlsVersion) {
return tlsVersion.javaName;
}
@Override
public void callEnqueue(Call call, Callback responseCallback, boolean forWebSocket) {
call.enqueue(responseCallback, forWebSocket);

3
okhttp/src/main/java/com/squareup/okhttp/internal/Internal.java
View File

@@ -23,7 +23,6 @@ import com.squareup.okhttp.Headers;
import com.squareup.okhttp.OkHttpClient;
import com.squareup.okhttp.Protocol;
import com.squareup.okhttp.Request;
import com.squareup.okhttp.TlsVersion;
import com.squareup.okhttp.internal.http.HttpEngine;
import com.squareup.okhttp.internal.http.Transport;
import java.io.IOException;
@@ -70,8 +69,6 @@ public abstract class Internal {
public abstract void connectAndSetOwner(OkHttpClient client, Connection connection,
HttpEngine owner, Request request) throws IOException;
public abstract String tlsVersionJavaName(TlsVersion tlsVersion);
// TODO delete the following when web sockets move into the main package.
public abstract void callEnqueue(Call call, Callback responseCallback, boolean forWebSocket);
public abstract void callEngineReleaseConnection(Call call) throws IOException;