diff --git a/app/build.gradle b/app/build.gradle index 8d872fd8a..d04bce1db 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -84,6 +84,15 @@ android { versionCode defaultConfig.versionCode + braveVersionCode versionName "${defaultConfig.versionName}-${braveVersionName}" } + + braveConscrypt { + dimension 'default' + applicationId "com.github.bravenewpipe" + resValue "string", "app_name", "BraveNewPipe" + versionCode defaultConfig.versionCode + braveVersionCode + versionName "${defaultConfig.versionName}-${braveVersionName}" + android.sourceSets.braveConscrypt.res.srcDirs = android.sourceSets.brave.res.srcDirs + } } lint { @@ -297,6 +306,9 @@ dependencies { // Date and time formatting implementation "org.ocpsoft.prettytime:prettytime:5.0.2.Final" + // conscrypt libraries + braveConscryptImplementation 'org.conscrypt:conscrypt-android:2.4.0' + /** Debugging **/ // Memory leak detection implementation "com.squareup.leakcanary:leakcanary-object-watcher-android:${leakCanaryVersion}" diff --git a/app/src/brave/java/org/schabi/newpipe/BraveApp.java b/app/src/brave/java/org/schabi/newpipe/BraveApp.java new file mode 100644 index 000000000..5a56feaf6 --- /dev/null +++ b/app/src/brave/java/org/schabi/newpipe/BraveApp.java @@ -0,0 +1,6 @@ +package org.schabi.newpipe; + +import androidx.multidex.MultiDexApplication; + +public class BraveApp extends MultiDexApplication { +} diff --git a/app/src/braveConscrypt/java/org/schabi/newpipe/BraveApp.java b/app/src/braveConscrypt/java/org/schabi/newpipe/BraveApp.java new file mode 100644 index 000000000..d0f16dc91 --- /dev/null +++ b/app/src/braveConscrypt/java/org/schabi/newpipe/BraveApp.java @@ -0,0 +1,15 @@ +package org.schabi.newpipe; + +import org.conscrypt.Conscrypt; + +import java.security.Security; + +import androidx.multidex.MultiDexApplication; + +public class BraveApp extends MultiDexApplication { + @Override + public void onCreate() { + super.onCreate(); + Security.insertProviderAt(Conscrypt.newProvider(), 1); + } +} diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java index 6b02e21ca..0c67df30e 100644 --- a/app/src/main/java/org/schabi/newpipe/App.java +++ b/app/src/main/java/org/schabi/newpipe/App.java @@ -7,7 +7,6 @@ import android.util.Log; import androidx.annotation.NonNull; import androidx.core.app.NotificationChannelCompat; import androidx.core.app.NotificationManagerCompat; -import androidx.multidex.MultiDexApplication; import androidx.preference.PreferenceManager; import com.jakewharton.processphoenix.ProcessPhoenix; @@ -56,7 +55,7 @@ import io.reactivex.rxjava3.plugins.RxJavaPlugins; * along with NewPipe. If not, see . */ -public class App extends MultiDexApplication { +public class App extends BraveApp { public static final String PACKAGE_NAME = BuildConfig.APPLICATION_ID; private static final String TAG = App.class.toString(); private static App app;