Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow WebSocketModule to take custom httpclient #16014

Closed
wants to merge 1 commit into from
Closed

allow WebSocketModule to take custom httpclient #16014

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,22 @@ public interface ContentHandler {

private ReactContext mReactContext;
private ForwardingCookieHandler mCookieHandler;
private OkHttpClient mHttpClient;

public WebSocketModule(ReactApplicationContext context) {
OkHttpClient client = new OkHttpClient.Builder()
.connectTimeout(10, TimeUnit.SECONDS)
.writeTimeout(10, TimeUnit.SECONDS)
.readTimeout(0, TimeUnit.MINUTES) // Disable timeouts for read
.build();
this(context, client);
}

public WebSocketModule(ReactApplicationContext context, OkHttpClient client) {
super(context);
mReactContext = context;
mCookieHandler = new ForwardingCookieHandler(context);
mHttpClient = client;
}

private void sendEvent(String eventName, WritableMap params) {
Expand Down Expand Up @@ -85,12 +96,6 @@ public void connect(
@Nullable final ReadableArray protocols,
@Nullable final ReadableMap options,
final int id) {
OkHttpClient client = new OkHttpClient.Builder()
.connectTimeout(10, TimeUnit.SECONDS)
.writeTimeout(10, TimeUnit.SECONDS)
.readTimeout(0, TimeUnit.MINUTES) // Disable timeouts for read
.build();

Request.Builder builder = new Request.Builder().tag(id).url(url);

String cookie = getCookie(url);
Expand Down Expand Up @@ -136,7 +141,7 @@ public void connect(
}
}

client.newWebSocket(
mHttpClient.newWebSocket(
builder.build(),
new WebSocketListener() {

Expand Down