Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix formatting and remove unused code

Browse source
This commit is contained in:
Markus 2019-12-04 12:49:47 +01:00
parent c0453065e4
commit 3e409b9cc1
3 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/org/schabi/newpipe/util/TLSSocketFactoryCompat.java
View file

@ -21,14 +21,15 @@ import javax.net.ssl.TrustManager;
public class TLSSocketFactoryCompat extends SSLSocketFactory {
private static TLSSocketFactoryCompat instance=null;
private static TLSSocketFactoryCompat instance = null;
private SSLSocketFactory internalSSLSocketFactory;
public static TLSSocketFactoryCompat getInstance() throws NoSuchAlgorithmException, KeyManagementException {
if(instance!=null)
if (instance != null) {
return instance;
return instance=new TLSSocketFactoryCompat();
}
return instance = new TLSSocketFactoryCompat();
}
@ -93,7 +94,7 @@ public class TLSSocketFactoryCompat extends SSLSocketFactory {
}
private Socket enableTLSOnSocket(Socket socket) {
if(socket != null && (socket instanceof SSLSocket)) {
if (socket != null && (socket instanceof SSLSocket)) {
/*
//Create list of supported protocols
ArrayList<String> supportedProtocols = new ArrayList<>();
@ -119,7 +120,7 @@ public class TLSSocketFactoryCompat extends SSLSocketFactory {
//((SSLSocket)socket).setEnabledProtocols(protocolArray);
*/
// OR: only enable TLS 1.1 and 1.2!
((SSLSocket)socket).setEnabledProtocols(new String[] {"TLSv1.1", "TLSv1.2"});
((SSLSocket) socket).setEnabledProtocols(new String[]{"TLSv1.1", "TLSv1.2"});
}
return socket;