baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

Remove commented-out code and hide stacktraces in release mode

Browse source
This commit is contained in:
Markus 2019-12-13 21:15:16 +01:00
parent 23c2f748d6
commit 559bcfc6a5
2 changed files with 6 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/schabi/newpipe/DownloaderImpl.java
View file

@ -35,6 +35,8 @@ import okhttp3.OkHttpClient;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import okhttp3.ResponseBody; import okhttp3.ResponseBody;
import static org.schabi.newpipe.MainActivity.DEBUG;
public class DownloaderImpl extends Downloader { public class DownloaderImpl extends Downloader {
public static final String USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:43.0) Gecko/20100101 Firefox/43.0"; public static final String USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:43.0) Gecko/20100101 Firefox/43.0";
@ -211,7 +213,7 @@ public class DownloaderImpl extends Downloader {
builder.connectionSpecs(Arrays.asList(legacyTLS, ConnectionSpec.CLEARTEXT)); builder.connectionSpecs(Arrays.asList(legacyTLS, ConnectionSpec.CLEARTEXT));
} catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException e) { } catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException e) {
e.printStackTrace(); if (DEBUG) e.printStackTrace();
} }
} }
} }

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

@ -13,6 +13,8 @@ import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManager;
import static org.schabi.newpipe.MainActivity.DEBUG;
/** /**
* This is an extension of the SSLSocketFactory which enables TLS 1.2 and 1.1. * This is an extension of the SSLSocketFactory which enables TLS 1.2 and 1.1.
@ -49,7 +51,7 @@ public class TLSSocketFactoryCompat extends SSLSocketFactory {
try { try {
HttpsURLConnection.setDefaultSSLSocketFactory(getInstance()); HttpsURLConnection.setDefaultSSLSocketFactory(getInstance());
} catch (NoSuchAlgorithmException | KeyManagementException e) { } catch (NoSuchAlgorithmException | KeyManagementException e) {
e.printStackTrace(); if (DEBUG) e.printStackTrace();
} }
} }
@ -95,33 +97,7 @@ public class TLSSocketFactoryCompat extends SSLSocketFactory {
private Socket enableTLSOnSocket(Socket socket) { 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<>();
for (String protocol : ((SSLSocket)socket).getEnabledProtocols()) {
//Log.d("TLSSocketFactory", "Supported protocol:" + protocol);
//Only add TLS protocols (don't want ot support older SSL versions)
if (protocol.toUpperCase().contains("TLS")) {
supportedProtocols.add(protocol);
}
}
//Force add TLSv1.1 and 1.2 if not already added
if (!supportedProtocols.contains("TLSv1.1")) {
supportedProtocols.add("TLSv1.1");
}
if (!supportedProtocols.contains("TLSv1.2")) {
supportedProtocols.add("TLSv1.2");
}
String[] protocolArray = supportedProtocols.toArray(new String[supportedProtocols.size()]);
//enable protocols in our list
//((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; return socket;
} }