Merge pull request koush#258 from surfstudio/session_id

Expose socket io session id to SocketIOTransport

Author: koush

AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java

@@ -111,7 +111,7 @@ void reconnect(final DependentCancellable child) {
             @Override
             protected void transform(String result) throws Exception {
                 String[] parts = result.split(":");
-                String session = parts[0];
+                final String sessionId = parts[0];
                 if (!"".equals(parts[1]))
                     heartbeat = Integer.parseInt(parts[1]) / 2 * 1000;
                 else
@@ -124,7 +124,7 @@ protected void transform(String result) throws Exception {
 
                 if (set.contains("websocket")) {
                     final String sessionUrl = Uri.parse(request.getUri().toString()).buildUpon()
-                            .appendPath("websocket").appendPath(session)
+                            .appendPath("websocket").appendPath(sessionId)
                             .build().toString();
 
                     httpClient.websocket(sessionUrl, null, null)
@@ -135,14 +135,14 @@ public void onCompleted(Exception e, WebSocket result) {
                                 transport.setComplete(e);
                                 return;
                             }
-                            transport.setComplete(new WebSocketTransport(result));
+                            transport.setComplete(new WebSocketTransport(result, sessionId));
                         }
                     });
                 } else if (set.contains("xhr-polling")) {
                     final String sessionUrl = Uri.parse(request.getUri().toString()).buildUpon()
-                            .appendPath("xhr-polling").appendPath(session)
+                            .appendPath("xhr-polling").appendPath(sessionId)
                             .build().toString();
-                    XHRPollingTransport xhrPolling = new XHRPollingTransport(httpClient, sessionUrl);
+                    XHRPollingTransport xhrPolling = new XHRPollingTransport(httpClient, sessionUrl, sessionId);
                     transport.setComplete(xhrPolling);
                 } else {
                     throw new SocketIOException("transport not supported");

AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/SocketIOTransport.java

@@ -35,4 +35,6 @@ static public interface StringCallback {
      * @return
      */
     public boolean heartbeats();
+    
+    public String getSessionId();
 }

AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/WebSocketTransport.java

@@ -8,10 +8,11 @@
 public class WebSocketTransport implements SocketIOTransport {
     private WebSocket webSocket;
     private StringCallback stringCallback;
+	private String sessionId;
 
-    public WebSocketTransport(WebSocket webSocket) {
+    public WebSocketTransport(WebSocket webSocket, String sessionId) {
         this.webSocket = webSocket;
-
+        this.sessionId = sessionId;
         this.webSocket.setDataCallback(new NullDataCallback());
     }
 
@@ -63,4 +64,10 @@ public void onStringAvailable(String s) {
     public boolean heartbeats() {
         return true;
     }
+
+	@Override
+	public String getSessionId() {
+		return this.sessionId;
+	}
 }
+

AndroidAsync/src/com/koushikdutta/async/http/socketio/transport/XHRPollingTransport.java

@@ -18,13 +18,15 @@ public class XHRPollingTransport implements SocketIOTransport {
     private StringCallback stringCallback;
     private CompletedCallback closedCallback;
     private boolean connected;
+	private String sessionId;
 
     private static final String SEPARATOR = "\ufffd";
 
-    public XHRPollingTransport(AsyncHttpClient client, String sessionUrl) {
+    public XHRPollingTransport(AsyncHttpClient client, String sessionUrl, String sessionId) {
         this.client = client;
         this.sessionUrl = Uri.parse(sessionUrl);
-
+        this.sessionId = sessionId;
+        
         doLongPolling();
         connected = true;
     }
@@ -135,4 +137,9 @@ public void setStringCallback(StringCallback callback) {
     public boolean heartbeats() {
         return false;
     }
+
+	@Override
+	public String getSessionId() {
+		return this.sessionId;
+	}
 }