Apply custom configuration statically

dimagi · Sep 18, 2023 · 6a720db · 6a720db
1 parent 279f859
commit 6a720db
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 34 deletions.
diff --git a/app/src/org/commcare/network/CTInterceptorConfig.kt b/app/src/org/commcare/network/CTInterceptorConfig.kt
@@ -19,39 +19,40 @@ class CTInterceptorConfig {
         private var interceptor: Interceptor? = null
         private var previousRequestFailed = false
         private var interceptorAttached = false
-    }
 
-    fun toggleCertificateTransparency(client: OkHttpClient.Builder) {
-        if (HiddenPreferences.isCertificateTransparencyEnabled()) {
-            if (!interceptorAttached) {
-                client.addNetworkInterceptor(getCTInterceptor())
-                interceptorAttached = true
+        @JvmStatic
+        fun toggleCertificateTransparency(client: OkHttpClient.Builder) {
+            if (HiddenPreferences.isCertificateTransparencyEnabled()) {
+                if (!interceptorAttached) {
+                    client.addNetworkInterceptor(getCTInterceptor())
+                    interceptorAttached = true
+                }
+            } else if (interceptorAttached) {
+                removeCTInterceptors(client)
+                interceptorAttached = false
             }
-        } else if (interceptorAttached) {
-            removeCTInterceptors(client)
-            interceptorAttached = false
         }
-    }
 
-    private fun getCTInterceptor(): Interceptor {
-        if (interceptor == null) {
-            interceptor = certificateTransparencyInterceptor {
-                logger = object : CTLogger {
-                    override fun log(host: String, result: VerificationResult) {
-                        if (result is VerificationResult.Failure && !previousRequestFailed) {
-                            Logger.log(
-                                LogTypes.TYPE_NETWORK,
-                                "Certificate verification failed: $host -> $result")
+        private fun getCTInterceptor(): Interceptor {
+            if (interceptor == null) {
+                interceptor = certificateTransparencyInterceptor {
+                    logger = object : CTLogger {
+                        override fun log(host: String, result: VerificationResult) {
+                            if (result is VerificationResult.Failure && !previousRequestFailed) {
+                                Logger.log(
+                                        LogTypes.TYPE_NETWORK,
+                                        "Certificate verification failed: $host -> $result")
+                            }
+                            previousRequestFailed = result is VerificationResult.Failure
                         }
-                        previousRequestFailed = result is VerificationResult.Failure
                     }
                 }
             }
+            return interceptor!!
         }
-        return interceptor!!
-    }
 
-    private fun removeCTInterceptors(client: OkHttpClient.Builder) {
-        client.networkInterceptors().removeAll { it === interceptor }
+        private fun removeCTInterceptors(client: OkHttpClient.Builder) {
+            client.networkInterceptors().removeAll { it === interceptor }
+        }
     }
 }
diff --git a/app/src/org/commcare/network/ISRGCertConfig.java b/app/src/org/commcare/network/ISRGCertConfig.java
@@ -21,7 +21,7 @@
  */
 public class ISRGCertConfig {
 
-    public void attachISRGRootCertificate(OkHttpClient.Builder okHttpBuilder) {
+    public static void attachISRGRootCertificate(OkHttpClient.Builder okHttpBuilder) {
         String isgCert =
                 "-----BEGIN CERTIFICATE-----\n" +
                         "MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw\n" +

diff --git a/app/src/org/commcare/network/OkHttpBuilderCustomConfig.java b/app/src/org/commcare/network/OkHttpBuilderCustomConfig.java
@@ -12,22 +12,15 @@
  * Certificate Transparency
  */
 public class OkHttpBuilderCustomConfig implements HttpBuilderConfig {
-    private CTInterceptorConfig ctInterceptorConfig;
-    private ISRGCertConfig isrgCertConfig;
-
-    public OkHttpBuilderCustomConfig(){
-         ctInterceptorConfig = new CTInterceptorConfig();
-         isrgCertConfig = new ISRGCertConfig();
-    }
 
     @Override
     public OkHttpClient.Builder performCustomConfig(OkHttpClient.Builder okHttpBuilder) {
         // Enable or Disable CT, depending on the current value of the preference
-        ctInterceptorConfig.toggleCertificateTransparency(okHttpBuilder);
+        CTInterceptorConfig.toggleCertificateTransparency(okHttpBuilder);
 
         // Attach ISRG Root Certificate when running Android 7.1 and below
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.N_MR1) {
-            isrgCertConfig.attachISRGRootCertificate(okHttpBuilder);
+            ISRGCertConfig.attachISRGRootCertificate(okHttpBuilder);
         }
 
         return okHttpBuilder;