Add conscrypt to fix soundcloud mediacc not working on Jellybean Kitk…

…at devices Huge thanks to @evermind-zz for BraveNewPipeLegacy Conscrypt implementation Co-Authored-By: evermind-zz <[email protected]>
ShareASmile · Jan 1, 2024 · 71b0a91 · 71b0a91
1 parent da5b7e9
commit 71b0a91
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/app/build.gradle b/app/build.gradle
@@ -263,6 +263,9 @@ dependencies {
     // Date and time formatting
     implementation "org.ocpsoft.prettytime:prettytime:5.0.7.Final"
 
+    // conscrypt libraries
+    implementation "org.conscrypt:conscrypt-android:2.5.2"
+
 /** Debugging **/
     // Memory leak detection
     implementation "com.squareup.leakcanary:leakcanary-object-watcher-android:${leakCanaryVersion}"

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -51,3 +51,7 @@
     private void writeObject(java.io.ObjectOutputStream);
     private void readObject(java.io.ObjectInputStream);
 }
+
+# conscrypt rules
+-dontwarn com.android.org.conscrypt.SSLParametersImpl
+-dontwarn org.apache.harmony.xnet.provider.jsse.SSLParametersImpl
diff --git a/app/src/main/java/org/schabi/newpipelegacy/App.java b/app/src/main/java/org/schabi/newpipelegacy/App.java
@@ -20,6 +20,7 @@
 import org.acra.config.ACRAConfigurationException;
 import org.acra.config.CoreConfiguration;
 import org.acra.config.CoreConfigurationBuilder;
+import org.conscrypt.Conscrypt;
 import org.schabi.newpipelegacy.error.ErrorActivity;
 import org.schabi.newpipelegacy.error.ErrorInfo;
 import org.schabi.newpipelegacy.error.ReCaptchaActivity;
@@ -34,6 +35,7 @@
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
+import java.security.Security;
 import java.net.SocketException;
 import java.util.Arrays;
 import java.util.Collections;
@@ -90,6 +92,8 @@ public void onCreate() {
 
         app = this;
 
+        Security.insertProviderAt(Conscrypt.newProvider(), 1);
+
         // Initialize settings first because others inits can use its values
         SettingsActivity.initSettings(this);
 

diff --git a/app/src/main/java/org/schabi/newpipelegacy/util/TLSSocketFactoryCompat.java b/app/src/main/java/org/schabi/newpipelegacy/util/TLSSocketFactoryCompat.java
@@ -107,7 +107,7 @@ public Socket createSocket(final InetAddress address, final int port,
 
     private Socket enableTLSOnSocket(final Socket socket) {
         if (socket instanceof SSLSocket) {
-            ((SSLSocket) socket).setEnabledProtocols(new String[]{"TLSv1.1", "TLSv1.2"});
+            ((SSLSocket) socket).setEnabledProtocols(new String[]{"TLSv1.1", "TLSv1.2", "TLSv1.3"});
         }
         return socket;
     }