Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix formatting and remove unused code

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/schabi/newpipe/DownloaderImpl.java
View File

@ -173,12 +173,14 @@ public class DownloaderImpl extends Downloader {
/** /**
* Enable TLS 1.2 and 1.1 on Android Kitkat. This function is mostly taken from the documentation of * Enable TLS 1.2 and 1.1 on Android Kitkat. This function is mostly taken from the documentation of
* OkHttpClient.Builder.sslSocketFactory(_,_) * OkHttpClient.Builder.sslSocketFactory(_,_)
* <p>
* If there is an error, the function will safely fall back to doing nothing and printing the error to the console.
* *
* If there is an error, It will safely fall back to doing nothing and printing the Error to the console.
* @param builder The HTTPClient Builder on which TLS is enabled on (will be modified in-place) * @param builder The HTTPClient Builder on which TLS is enabled on (will be modified in-place)
*/ */
private static void enableModernTLS(OkHttpClient.Builder builder) { private static void enableModernTLS(OkHttpClient.Builder builder) {
try { try {
// get the default TrustManager
TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance( TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(
TrustManagerFactory.getDefaultAlgorithm()); TrustManagerFactory.getDefaultAlgorithm());
trustManagerFactory.init((KeyStore) null); trustManagerFactory.init((KeyStore) null);
@ -189,9 +191,7 @@ public class DownloaderImpl extends Downloader {
} }
X509TrustManager trustManager = (X509TrustManager) trustManagers[0]; X509TrustManager trustManager = (X509TrustManager) trustManagers[0];
SSLContext sslContext = SSLContext.getInstance("TLS"); // insert our own TLSSocketFactory
sslContext.init(null, new TrustManager[] { trustManager }, null);
//SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
SSLSocketFactory sslSocketFactory = TLSSocketFactoryCompat.getInstance(); SSLSocketFactory sslSocketFactory = TLSSocketFactoryCompat.getInstance();
builder.sslSocketFactory(sslSocketFactory, trustManager); builder.sslSocketFactory(sslSocketFactory, trustManager);

5
app/src/main/java/org/schabi/newpipe/MainActivity.java
View File

@ -109,9 +109,10 @@ public class MainActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]"); if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
//enable TLS1.1/1.2 for kitkat devices, to fix download and play for mediaCCC sources // enable TLS1.1/1.2 for kitkat devices, to fix download and play for mediaCCC sources
if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {
TLSSocketFactoryCompat.setAsDefault(); TLSSocketFactoryCompat.setAsDefault();
}
ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this)); ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));

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 { public class TLSSocketFactoryCompat extends SSLSocketFactory {
private static TLSSocketFactoryCompat instance=null; private static TLSSocketFactoryCompat instance = null;
private SSLSocketFactory internalSSLSocketFactory; private SSLSocketFactory internalSSLSocketFactory;
public static TLSSocketFactoryCompat getInstance() throws NoSuchAlgorithmException, KeyManagementException { public static TLSSocketFactoryCompat getInstance() throws NoSuchAlgorithmException, KeyManagementException {
if(instance!=null) if (instance != null) {
return instance; return instance;
return instance=new TLSSocketFactoryCompat(); }
return instance = new TLSSocketFactoryCompat();
} }
@ -93,7 +94,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 //Create list of supported protocols
ArrayList<String> supportedProtocols = new ArrayList<>(); ArrayList<String> supportedProtocols = new ArrayList<>();
@ -119,7 +120,7 @@ public class TLSSocketFactoryCompat extends SSLSocketFactory {
//((SSLSocket)socket).setEnabledProtocols(protocolArray); //((SSLSocket)socket).setEnabledProtocols(protocolArray);
*/ */
// OR: only enable TLS 1.1 and 1.2! // 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;