Change to getCurrentSessionTokenAsync()

This allows the results to be chained together via tasks, and also allows the
CurrentUserController to be overridden to provide additional functionality
for retrieving the session token.

This matches how the ParseCloud and ParseObject retrieve the session token.

Author: Joe Hansche

ParseLiveQuery/src/main/java/com/parse/ParseLiveQueryClientImpl.java

@@ -1,6 +1,5 @@
 package com.parse;
 
-
 import android.util.Log;
 import android.util.SparseArray;
 
@@ -179,7 +178,6 @@ private void parseMessage(String message) throws LiveQueryException {
         } catch (JSONException e) {
             throw new LiveQueryException.InvalidResponseException(message);
         }
-
     }
 
     private void handleSubscribedEvent(JSONObject jsonObject) throws JSONException {
@@ -237,8 +235,13 @@ private WebSocketClient.WebSocketClientCallback getWebSocketClientCallback() {
             @Override
             public void onOpen() {
                 Log.v(LOG_TAG, "Socket opened");
-                String sessionToken = ParseUser.getCurrentSessionToken();
-                sendOperationAsync(new ConnectClientOperation(applicationId, sessionToken)).continueWith(new Continuation<Void, Void>() {
+                ParseUser.getCurrentSessionTokenAsync().onSuccessTask(new Continuation<String, Task<Void>>() {
+                    @Override
+                    public Task<Void> then(Task<String> task) throws Exception {
+                        String sessionToken = task.getResult();
+                        return sendOperationAsync(new ConnectClientOperation(applicationId, sessionToken));
+                    }
+                }).continueWith(new Continuation<Void, Void>() {
                     public Void then(Task<Void> task) {
                         Exception error = task.getError();
                         if (error != null) {
@@ -279,5 +282,4 @@ public void stateChanged() {
             }
         };
     }
-
 }

ParseLiveQuery/src/test/java/com/parse/TestParseLiveQueryClient.java

@@ -37,6 +37,7 @@ public class TestParseLiveQueryClient {
     private WebSocketClient webSocketClient;
     private WebSocketClient.WebSocketClientCallback webSocketClientCallback;
     private ParseLiveQueryClient<ParseObject> parseLiveQueryClient;
+
     private ParseUser mockUser;
 
     @Before
@@ -52,6 +53,12 @@ public Task<ParseUser> answer(InvocationOnMock invocation) throws Throwable {
                 return Task.forResult(mockUser);
             }
         });
+        when(currentUserController.getCurrentSessionTokenAsync()).thenAnswer(new Answer<Task<String>>() {
+            @Override
+            public Task<String> answer(InvocationOnMock invocation) throws Throwable {
+                return Task.forResult(mockUser.getSessionToken());
+            }
+        });
         ParseCorePlugins.getInstance().registerCurrentUserController(currentUserController);
 
         parseLiveQueryClient = ParseLiveQueryClient.Factory.getClient(new URI(""), new WebSocketClientFactory() {