Commit a0d5c1cb authored by Yusuke Iwaki's avatar Yusuke Iwaki

bump okhttp to 3.5.0

parent aa7eb67a
...@@ -37,7 +37,7 @@ android { ...@@ -37,7 +37,7 @@ android {
dependencies { dependencies {
compile project(':log-wrapper') compile project(':log-wrapper')
compile rootProject.ext.supportAnnotations compile rootProject.ext.supportAnnotations
compile 'com.squareup.okhttp3:okhttp-ws:3.4.1' compile rootProject.ext.okhttp3
compile rootProject.ext.rxJava compile rootProject.ext.rxJava
compile rootProject.ext.boltsTask compile rootProject.ext.boltsTask
} }
...@@ -4,13 +4,9 @@ import java.io.IOException; ...@@ -4,13 +4,9 @@ import java.io.IOException;
import chat.rocket.android.log.RCLog; import chat.rocket.android.log.RCLog;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response; import okhttp3.Response;
import okhttp3.ResponseBody; import okhttp3.WebSocket;
import okhttp3.ws.WebSocket; import okhttp3.WebSocketListener;
import okhttp3.ws.WebSocketCall;
import okhttp3.ws.WebSocketListener;
import okio.Buffer;
import rx.Observable; import rx.Observable;
import rx.Subscriber; import rx.Subscriber;
import rx.exceptions.OnErrorNotImplementedException; import rx.exceptions.OnErrorNotImplementedException;
...@@ -28,12 +24,11 @@ public class RxWebSocket { ...@@ -28,12 +24,11 @@ public class RxWebSocket {
public ConnectableObservable<RxWebSocketCallback.Base> connect(String url) { public ConnectableObservable<RxWebSocketCallback.Base> connect(String url) {
final Request request = new Request.Builder().url(url).build(); final Request request = new Request.Builder().url(url).build();
WebSocketCall call = WebSocketCall.create(httpClient, request);
return Observable.create(new Observable.OnSubscribe<RxWebSocketCallback.Base>() { return Observable.create(new Observable.OnSubscribe<RxWebSocketCallback.Base>() {
@Override @Override
public void call(Subscriber<? super RxWebSocketCallback.Base> subscriber) { public void call(Subscriber<? super RxWebSocketCallback.Base> subscriber) {
call.enqueue(new WebSocketListener() { httpClient.newWebSocket(request, new WebSocketListener() {
@Override @Override
public void onOpen(WebSocket webSocket, Response response) { public void onOpen(WebSocket webSocket, Response response) {
isConnected = true; isConnected = true;
...@@ -42,29 +37,23 @@ public class RxWebSocket { ...@@ -42,29 +37,23 @@ public class RxWebSocket {
} }
@Override @Override
public void onFailure(IOException e, Response response) { public void onFailure(WebSocket webSocket, Throwable err, Response response) {
try { try {
isConnected = false; isConnected = false;
subscriber.onError(new RxWebSocketCallback.Failure(webSocket, e, response)); subscriber.onError(new RxWebSocketCallback.Failure(webSocket, err, response));
} catch (OnErrorNotImplementedException ex) { } catch (OnErrorNotImplementedException ex) {
RCLog.w(ex, "OnErrorNotImplementedException ignored"); RCLog.w(ex, "OnErrorNotImplementedException ignored");
} }
} }
@Override @Override
public void onMessage(ResponseBody responseBody) throws IOException { public void onMessage(WebSocket webSocket, String text) {
isConnected = true; isConnected = true;
subscriber.onNext(new RxWebSocketCallback.Message(webSocket, responseBody)); subscriber.onNext(new RxWebSocketCallback.Message(webSocket, text));
} }
@Override @Override
public void onPong(Buffer payload) { public void onClosed(WebSocket webSocket, int code, String reason) {
isConnected = true;
subscriber.onNext(new RxWebSocketCallback.Pong(webSocket, payload));
}
@Override
public void onClose(int code, String reason) {
isConnected = false; isConnected = false;
subscriber.onNext(new RxWebSocketCallback.Close(webSocket, code, reason)); subscriber.onNext(new RxWebSocketCallback.Close(webSocket, code, reason));
subscriber.onCompleted(); subscriber.onCompleted();
...@@ -75,7 +64,7 @@ public class RxWebSocket { ...@@ -75,7 +64,7 @@ public class RxWebSocket {
} }
public void sendText(String message) throws IOException { public void sendText(String message) throws IOException {
webSocket.sendMessage(RequestBody.create(WebSocket.TEXT, message)); webSocket.send(message);
} }
public boolean isConnected() { public boolean isConnected() {
......
...@@ -2,12 +2,9 @@ package chat.rocket.android_ddp.rx; ...@@ -2,12 +2,9 @@ package chat.rocket.android_ddp.rx;
import static android.R.attr.type; import static android.R.attr.type;
import java.io.IOException;
import chat.rocket.android.log.RCLog; import chat.rocket.android.log.RCLog;
import okhttp3.Response; import okhttp3.Response;
import okhttp3.ResponseBody; import okhttp3.WebSocket;
import okhttp3.ws.WebSocket;
import okio.Buffer;
public class RxWebSocketCallback { public class RxWebSocketCallback {
public static abstract class Base { public static abstract class Base {
...@@ -38,8 +35,8 @@ public class RxWebSocketCallback { ...@@ -38,8 +35,8 @@ public class RxWebSocketCallback {
public WebSocket ws; public WebSocket ws;
public Response response; public Response response;
public Failure(WebSocket websocket, IOException e, Response response) { public Failure(WebSocket websocket, Throwable err, Response response) {
super(e); super(err);
this.ws = websocket; this.ws = websocket;
this.response = response; this.response = response;
} }
...@@ -57,10 +54,10 @@ public class RxWebSocketCallback { ...@@ -57,10 +54,10 @@ public class RxWebSocketCallback {
public static class Message extends Base { public static class Message extends Base {
public String responseBodyString; public String responseBodyString;
public Message(WebSocket websocket, ResponseBody responseBody) { public Message(WebSocket websocket, String responseBody) {
super("Message", websocket); super("Message", websocket);
try { try {
this.responseBodyString = responseBody.string(); this.responseBodyString = responseBody;
} catch (Exception e) { } catch (Exception e) {
RCLog.e(e, "error in reading response(Message)"); RCLog.e(e, "error in reading response(Message)");
} }
...@@ -72,15 +69,6 @@ public class RxWebSocketCallback { ...@@ -72,15 +69,6 @@ public class RxWebSocketCallback {
} }
} }
public static class Pong extends Base {
public Buffer payload;
public Pong(WebSocket websocket, Buffer payload) {
super("Pong", websocket);
this.payload = payload;
}
}
public static class Close extends Base { public static class Close extends Base {
public int code; public int code;
public String reason; public String reason;
......
...@@ -15,7 +15,7 @@ ext { ...@@ -15,7 +15,7 @@ ext {
rxJava = 'io.reactivex:rxjava:1.2.2' rxJava = 'io.reactivex:rxjava:1.2.2'
boltsTask = 'com.parse.bolts:bolts-tasks:1.4.0' boltsTask = 'com.parse.bolts:bolts-tasks:1.4.0'
okhttp3 = 'com.squareup.okhttp3:okhttp:3.4.1' okhttp3 = 'com.squareup.okhttp3:okhttp:3.5.0'
picasso = 'com.squareup.picasso:picasso:2.5.2' picasso = 'com.squareup.picasso:picasso:2.5.2'
picasso2Okhttp3Downloader = 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0' picasso2Okhttp3Downloader = 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
textDrawable = 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' textDrawable = 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment