Possibility to set custom OkHttpClient (#68)

---------

Co-authored-by: Anton Samoilov <[email protected]>
Co-authored-by: Alexander Emelin <[email protected]>

Author: 3 people

centrifuge/build.gradle

@@ -23,7 +23,7 @@ publishing {
 }
 
 dependencies {
-    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    api 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'com.google.protobuf:protobuf-javalite:3.25.5'
     implementation 'net.sourceforge.streamsupport:streamsupport-minifuture:1.7.4'
 

centrifuge/src/main/java/io/github/centrifugal/centrifuge/Client.java

@@ -259,7 +259,12 @@ private void _connect() {
             this.ws.cancel();
         }
 
-        OkHttpClient.Builder okHttpBuilder = new OkHttpClient.Builder();
+        OkHttpClient.Builder okHttpBuilder;
+        if (opts.getOkHttpClient() != null) {
+            okHttpBuilder = opts.getOkHttpClient().newBuilder();
+        } else {
+            okHttpBuilder = new OkHttpClient.Builder();
+        }
 
         Dns dns = opts.getDns();
         if (dns != null) {
@@ -558,7 +563,7 @@ private ServerSubscription getServerSub(String channel) {
      * Create new subscription to channel with SubscriptionOptions and SubscriptionEventListener
      *
      * @param channel:  to create Subscription for.
-     * @param options: to pass SubscriptionOptions, e.g. token.
+     * @param options:  to pass SubscriptionOptions, e.g. token.
      * @param listener: to pass event handler.
      * @return Subscription.
      * @throws DuplicateSubscriptionException if Subscription already exists in internal registry.

centrifuge/src/main/java/io/github/centrifugal/centrifuge/Options.java

@@ -5,6 +5,8 @@
 import java.net.Proxy;
 import java.util.Map;
 
+import okhttp3.OkHttpClient;
+
 /**
  * Configuration for a {@link Client} instance.
  */
@@ -148,8 +150,21 @@ public void setMaxServerPingDelay(int maxServerPingDelay) {
 
     private int maxServerPingDelay = 10000;
 
+    public OkHttpClient getOkHttpClient() {
+        return this.okHttpClient;
+    }
+
+    /**
+     * Set OkHttpClient. Can be used to pass configured custom OkHttpClient (with DNS, proxy, SSLSocketFactory etc.).
+     */
+    public void setOkHttpClient(OkHttpClient okHttpClient) {
+        this.okHttpClient = okHttpClient;
+    }
+
+    private OkHttpClient okHttpClient;
+
     /**
-     * Set proxy to use.
+     * Set proxy to use in default OkHttpClient builder. Won't be used if {@link #setOkHttpClient} was used.
      */
     public void setProxy(Proxy proxy) {
         this.proxy = proxy;
@@ -165,7 +180,7 @@ public Proxy getProxy() {
     private String proxyPassword;
 
     /**
-     * Set proxy credentials.
+     * Set proxy credentials for default OkHttpClient builder. Won't be used if {@link #setOkHttpClient} was used.
      */
     public void setProxyCredentials(String login, String password) {
         this.proxyLogin = login;
@@ -185,7 +200,7 @@ public Dns getDns() {
     }
 
     /**
-     * Set custom DNS resolver..
+     * Set custom DNS resolver for default OkHttpClient builder. Won't be used if {@link #setOkHttpClient} was used.
      */
     public void setDns(Dns dns) {
         this.dns = dns;
@@ -194,14 +209,15 @@ public void setDns(Dns dns) {
     private Dns dns;
 
     /**
-     * Set custom SSLSocketFactory
+     * Set custom SSLSocketFactory for default OkHttpClient builder. Won't be used if {@link #setOkHttpClient} was used.
      */
     public void setSSLSocketFactory(SSLSocketFactory sslSocketFactory) {
         this.sslSocketFactory = sslSocketFactory;
     }
 
     /**
-     * Set custom SSLSocketFactory and X509TrustManager
+     * Set custom SSLSocketFactory and X509TrustManager for default OkHttpClient builder. 
+     * Won't be used if {@link #setOkHttpClient} was used.
      */
     public void setSSLSocketFactory(SSLSocketFactory sslSocketFactory, X509TrustManager trustManager) {
         this.sslSocketFactory = sslSocketFactory;