Skip to content

Get ws URI directly from server URL #30

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

Merged
merged 3 commits into from
Mar 27, 2017
Merged

Get ws URI directly from server URL #30

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
db767c0
Get ws URI directly from server URL
hermanliang Mar 26, 2017
1040abb
extract method
hermanliang Mar 27, 2017
d50da48
minor optimization
hermanliang Mar 27, 2017
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
4 changes: 4 additions & 0 deletions ParseLiveQuery/src/main/java/com/parse/ParseLiveQueryClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ public interface ParseLiveQueryClient {

class Factory {

public static ParseLiveQueryClient getClient() {
return new ParseLiveQueryClientImpl();
}

public static ParseLiveQueryClient getClient(URI uri) {
return new ParseLiveQueryClientImpl(uri);
}
Expand Down
23 changes: 23 additions & 0 deletions ParseLiveQuery/src/main/java/com/parse/ParseLiveQueryClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import org.json.JSONObject;

import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.concurrent.Callable;
import java.util.concurrent.Executor;

Expand All @@ -31,6 +33,10 @@
private int requestIdCount = 1;
private boolean userInitiatedDisconnect = false;

/* package */ ParseLiveQueryClientImpl() {
this(getDefaultUri());
}

/* package */ ParseLiveQueryClientImpl(URI uri) {
this(uri, new TubeSockWebSocketClient.TubeWebSocketClientFactory(), Task.BACKGROUND_EXECUTOR);
}
Expand All @@ -45,6 +51,23 @@
this.webSocketClientCallback = getWebSocketClientCallback();
}

private static URI getDefaultUri() {
URL serverUrl = ParseRESTCommand.server;
if (serverUrl == null) return null;
String url = serverUrl.toString();
if (serverUrl.getProtocol().equals("https")) {
url = url.replaceFirst("https", "wss");
} else {
url = url.replaceFirst("http", "ws");
}
try {
return new URI(url);
} catch (URISyntaxException e) {
e.printStackTrace();
throw new RuntimeException(e.getMessage());
}
}

@Override
public <T extends ParseObject> SubscriptionHandling<T> subscribe(ParseQuery<T> query) {
int requestId = requestIdGenerator();
Expand Down