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

2 cherry picks and a ping bugfix #12

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

2 cherry picks and a ping bugfix #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ea8d98
Create an SSL socket for https connections.
mike-stewart Feb 5, 2013
abb1134
Avoid mSocket NPE if WebSocketClient.disconnect() is called twice
cpeterso May 23, 2013
3ba8dcb
Ping frame should not be encapsulated in binary frame.
joepadmiraal Jun 21, 2013
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
2 changes: 1 addition & 1 deletion src/main/java/com/codebutler/android_websockets/HybiParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ private byte[] frame(Object data, int opcode, int errorCode) {
}

public void ping(String message) {
mClient.send(frame(message, OP_PING, -1));
mClient.sendFrame(frame(message, OP_PING, -1));
}

public void close(int code, String reason) {
Expand Down
16 changes: 9 additions & 7 deletions src/main/java/com/codebutler/android_websockets/WebSocketClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void run() {
try {
String secret = createSecret();

int port = (mURI.getPort() != -1) ? mURI.getPort() : (mURI.getScheme().equals("wss") ? 443 : 80);
int port = (mURI.getPort() != -1) ? mURI.getPort() : ((mURI.getScheme().equals("wss") || mURI.getScheme().equals("https")) ? 443 : 80);

String path = TextUtils.isEmpty(mURI.getPath()) ? "/" : mURI.getPath();
if (!TextUtils.isEmpty(mURI.getQuery())) {
Expand All @@ -82,7 +82,7 @@ public void run() {
String originScheme = mURI.getScheme().equals("wss") ? "https" : "http";
URI origin = new URI(originScheme, "//" + mURI.getHost(), null);

SocketFactory factory = mURI.getScheme().equals("wss") ? getSSLSocketFactory() : SocketFactory.getDefault();
SocketFactory factory = (mURI.getScheme().equals("wss") || mURI.getScheme().equals("https")) ? getSSLSocketFactory() : SocketFactory.getDefault();
mSocket = factory.createSocket(mURI.getHost(), port);

PrintWriter out = new PrintWriter(mSocket.getOutputStream());
Expand Down Expand Up @@ -160,12 +160,14 @@ public void disconnect() {
mHandler.post(new Runnable() {
@Override
public void run() {
try {
mSocket.close();
if (mSocket != null) {
try {
mSocket.close();
} catch (IOException ex) {
Log.d(TAG, "Error while disconnecting", ex);
mListener.onError(ex);
}
mSocket = null;
} catch (IOException ex) {
Log.d(TAG, "Error while disconnecting", ex);
mListener.onError(ex);
}
}
});
Expand Down