Skip to content

Back the subscriptions by a thread safe collection map #80

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 1 commit into from
Mar 28, 2018
Merged

Back the subscriptions by a thread safe collection map #80

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
24 changes: 10 additions & 14 deletions ParseLiveQuery/src/main/java/com/parse/ParseLiveQueryClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package com.parse;

import android.util.Log;
import android.util.SparseArray;

import bolts.Continuation;
import bolts.Task;
import okhttp3.OkHttpClient;
import org.json.JSONException;
import org.json.JSONObject;

Expand All @@ -13,12 +14,9 @@
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executor;

import bolts.Continuation;
import bolts.Task;
import okhttp3.OkHttpClient;

import static com.parse.Parse.checkInit;

/* package */ class ParseLiveQueryClientImpl implements ParseLiveQueryClient {
Expand All @@ -28,7 +26,7 @@
private final Executor taskExecutor;
private final String applicationId;
private final String clientKey;
private final SparseArray<Subscription<? extends ParseObject>> subscriptions = new SparseArray<>();
private final ConcurrentHashMap<Integer, Subscription<? extends ParseObject>> subscriptions = new ConcurrentHashMap<>();
private final URI uri;
private final WebSocketClientFactory webSocketClientFactory;
private final WebSocketClient.WebSocketClientCallback webSocketClientCallback;
Expand Down Expand Up @@ -87,7 +85,7 @@ private static URI getDefaultUri() {
public <T extends ParseObject> SubscriptionHandling<T> subscribe(ParseQuery<T> query) {
int requestId = requestIdGenerator();
Subscription<T> subscription = new Subscription<>(requestId, query);
subscriptions.append(requestId, subscription);
subscriptions.put(requestId, subscription);

if (isConnected()) {
sendSubscription(subscription);
Expand Down Expand Up @@ -124,8 +122,7 @@ public void connectIfNeeded() {
@Override
public <T extends ParseObject> void unsubscribe(final ParseQuery<T> query) {
if (query != null) {
for (int i = 0; i < subscriptions.size(); i++) {
Subscription subscription = subscriptions.valueAt(i);
for (Subscription<? extends ParseObject> subscription : subscriptions.values()) {
if (query.equals(subscription.getQuery())) {
sendUnsubscription(subscription);
}
Expand All @@ -136,8 +133,7 @@ public <T extends ParseObject> void unsubscribe(final ParseQuery<T> query) {
@Override
public <T extends ParseObject> void unsubscribe(final ParseQuery<T> query, final SubscriptionHandling<T> subscriptionHandling) {
if (query != null && subscriptionHandling != null) {
for (int i = 0; i < subscriptions.size(); i++) {
Subscription subscription = subscriptions.valueAt(i);
for (Subscription<? extends ParseObject> subscription : subscriptions.values()) {
if (query.equals(subscription.getQuery()) && subscriptionHandling.equals(subscription)) {
sendUnsubscription(subscription);
}
Expand Down Expand Up @@ -230,8 +226,8 @@ private void parseMessage(String message) throws LiveQueryException {
hasReceivedConnected = true;
dispatchConnected();
Log.v(LOG_TAG, "Connected, sending pending subscription");
for (int i = 0; i < subscriptions.size(); i++) {
sendSubscription(subscriptions.valueAt(i));
for (Subscription<? extends ParseObject> subscription : subscriptions.values()) {
sendSubscription(subscription);
}
break;
case "redirect":
Expand Down