Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 02:10:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove slow getResourceAsStream when loading the Conscrypt provider.

Browse Source
This commit is contained in:
Clark
2023-11-06 09:56:11 -05:00
committed by GitHub
parent d22537c5f2
commit 2782216e52
3 changed files with 806 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
View File

@@ -26,7 +26,7 @@ import androidx.multidex.MultiDexApplication;
import com.google.android.gms.security.ProviderInstaller;
import org.conscrypt.Conscrypt;
import org.conscrypt.ConscryptSignal;
import org.greenrobot.eventbus.EventBus;
import org.signal.aesgcmprovider.AesGcmProvider;
import org.signal.core.util.MemoryTracker;
@@ -168,7 +168,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
.addBlocking("proxy-init", () -> {
if (SignalStore.proxy().isProxyEnabled()) {
Log.w(TAG, "Proxy detected. Enabling Conscrypt.setUseEngineSocketByDefault()");
Conscrypt.setUseEngineSocketByDefault(true);
ConscryptSignal.setUseEngineSocketByDefault(true);
}
})
.addBlocking("blob-provider", this::initializeBlobProvider)
@@ -294,7 +294,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
throw new ProviderInitializationException();
}
int conscryptPosition = Security.insertProviderAt(Conscrypt.newProvider(), 2);
int conscryptPosition = Security.insertProviderAt(ConscryptSignal.newProvider(), 2);
Log.i(TAG, "Installed Conscrypt provider: " + conscryptPosition);
if (conscryptPosition < 0) {

6
app/src/main/java/org/thoughtcrime/securesms/util/SignalProxyUtil.java
View File

@@ -4,7 +4,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.WorkerThread;
import org.conscrypt.Conscrypt;
import org.conscrypt.ConscryptSignal;
import org.signal.core.util.concurrent.SignalExecutors;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
@@ -51,7 +51,7 @@ public final class SignalProxyUtil {
*/
public static void enableProxy(@NonNull SignalProxy proxy) {
SignalStore.proxy().enableProxy(proxy);
Conscrypt.setUseEngineSocketByDefault(true);
ConscryptSignal.setUseEngineSocketByDefault(true);
ApplicationDependencies.resetAllNetworkConnections();
startListeningToWebsocket();
}
@@ -62,7 +62,7 @@ public final class SignalProxyUtil {
*/
public static void disableProxy() {
SignalStore.proxy().disableProxy();
Conscrypt.setUseEngineSocketByDefault(false);
ConscryptSignal.setUseEngineSocketByDefault(false);
ApplicationDependencies.resetAllNetworkConnections();
startListeningToWebsocket();
}