API for getting handshake http headers

NaikSoftware · May 18, 2016 · d3a347f · d3a347f
1 parent 922175d
commit d3a347f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/LifecycleEvent.java b/lib/src/main/java/ua/naiksoftware/stomp/LifecycleEvent.java
@@ -1,6 +1,8 @@
 package ua.naiksoftware.stomp;
 
 
+import java.util.TreeMap;
+
 /**
  * Created by naik on 05.05.16.
  */
@@ -18,6 +20,8 @@ public enum Type {
     //Nullable
     private String mMessage;
 
+    private TreeMap<String, String> handshakeResponseHeaders = new TreeMap<>();
+
     public LifecycleEvent(Type type) {
         mType = type;
     }
@@ -43,4 +47,12 @@ public Exception getException() {
     public String getMessage() {
         return mMessage;
     }
+
+    public void setHandshakeResponseHeaders(TreeMap<String, String> handshakeResponseHeaders) {
+        this.handshakeResponseHeaders = handshakeResponseHeaders;
+    }
+
+    public TreeMap<String, String> getHandshakeResponseHeaders() {
+        return handshakeResponseHeaders;
+    }
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
@@ -12,8 +12,10 @@
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 import rx.Observable;
 import rx.Subscriber;
@@ -31,6 +33,7 @@ public class WebSocketsConnectionProvider implements ConnectionProvider {
     private List<Subscriber<? super LifecycleEvent>> mLifecycleSubscribers;
     private List<Subscriber<? super String>> mMessagesSubscribers;
     private boolean haveConnection;
+    private TreeMap<String, String> mServerHandshakeHeaders;
 
     /**
      * Support UIR scheme ws://host:port/path
@@ -68,12 +71,19 @@ private void createWebSocketConnection() {
 
             @Override
             public void onWebsocketHandshakeReceivedAsClient(WebSocket conn, ClientHandshake request, ServerHandshake response) throws InvalidDataException {
-                super.onWebsocketHandshakeReceivedAsClient(conn, request, response);
+                mServerHandshakeHeaders = new TreeMap<>();
+                Iterator<String> keys = response.iterateHttpFields();
+                while (keys.hasNext()) {
+                    String key = keys.next();
+                    mServerHandshakeHeaders.put(key, response.getFieldValue(key));
+                }
             }
 
             @Override
             public void onOpen(ServerHandshake handshakeData) {
-                emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.OPENED));
+                LifecycleEvent openEvent = new LifecycleEvent(LifecycleEvent.Type.OPENED);
+                openEvent.setHandshakeResponseHeaders(mServerHandshakeHeaders);
+                emitLifecycleEvent(openEvent);
             }
 
             @Override