Mastodon/Twidere-App-Android-Twitter-Mastodon
1
0
Fork 0
mirror of https://github.com/TwidereProject/Twidere-Android synced 2025-02-17 04:00:48 +01:00
Code Issues Releases Wiki Activity

fixed lint error

Browse Source
This commit is contained in:
Mariotaku Lee 2017-05-13 08:52:54 +08:00
parent 5828cd9063
commit 4f027b4af7
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
twidere/src/main/java/org/mariotaku/twidere/util/net/TLSSocketFactory.java
View File

@ -20,7 +20,6 @@
package org.mariotaku.twidere.util.net; package org.mariotaku.twidere.util.net;
import android.os.Build; import android.os.Build;
import android.support.annotation.RequiresApi;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;
@ -35,7 +34,6 @@ import javax.net.ssl.SSLSocketFactory;
/** /**
* @author fkrauthan * @author fkrauthan
*/ */
@RequiresApi(Build.VERSION_CODES.JELLY_BEAN)
public class TLSSocketFactory extends SSLSocketFactory { public class TLSSocketFactory extends SSLSocketFactory {
private SSLSocketFactory internalSSLSocketFactory; private SSLSocketFactory internalSSLSocketFactory;
@ -87,9 +85,11 @@ public class TLSSocketFactory extends SSLSocketFactory {
} }
private Socket enableTLSOnSocket(Socket socket) { private Socket enableTLSOnSocket(Socket socket) {
if(socket != null && (socket instanceof SSLSocket)) { if (socket == null || (!(socket instanceof SSLSocket))) {
((SSLSocket)socket).setEnabledProtocols(new String[] {"TLSv1.1", "TLSv1.2"}); return socket;
} }
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) return socket;
((SSLSocket) socket).setEnabledProtocols(new String[]{"TLSv1.1", "TLSv1.2"});
return socket; return socket;
} }
} }