mirror of
https://github.com/moparisthebest/k-9
synced 2024-11-23 09:52:16 -05:00
remove @Override : this causes breakage in jdk 1.5.
This commit is contained in:
parent
828ceba503
commit
b2b9d8d624
@ -3,7 +3,6 @@ package com.android.email.mail.transport;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.InetAddress;
|
import java.net.InetAddress;
|
||||||
import java.net.Socket;
|
import java.net.Socket;
|
||||||
import java.net.SocketAddress;
|
|
||||||
import java.net.UnknownHostException;
|
import java.net.UnknownHostException;
|
||||||
import java.security.KeyManagementException;
|
import java.security.KeyManagementException;
|
||||||
import java.security.NoSuchAlgorithmException;
|
import java.security.NoSuchAlgorithmException;
|
||||||
@ -34,23 +33,18 @@ public class TrustedSocketFactory implements SocketFactory {
|
|||||||
org.apache.http.conn.ssl.SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
|
org.apache.http.conn.ssl.SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public Socket connectSocket(Socket sock, String host, int port,
|
public Socket connectSocket(Socket sock, String host, int port,
|
||||||
InetAddress localAddress, int localPort, HttpParams params)
|
InetAddress localAddress, int localPort, HttpParams params)
|
||||||
throws IOException, UnknownHostException, ConnectTimeoutException {
|
throws IOException, UnknownHostException, ConnectTimeoutException {
|
||||||
return mSchemeSocketFactory.connectSocket(sock, host, port, localAddress, localPort, params);
|
return mSchemeSocketFactory.connectSocket(sock, host, port, localAddress, localPort, params);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public Socket createSocket() throws IOException {
|
public Socket createSocket() throws IOException {
|
||||||
// TODO Auto-generated method stub
|
|
||||||
return mSocketFactory.createSocket();
|
return mSocketFactory.createSocket();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
public boolean isSecure(Socket sock) throws IllegalArgumentException {
|
||||||
public boolean isSecure(Socket arg0) throws IllegalArgumentException {
|
return mSchemeSocketFactory.isSecure(sock);
|
||||||
// TODO Auto-generated method stub
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user