From fc78cba5ceb6d4c5148ff7715c376aed0ca27518 Mon Sep 17 00:00:00 2001 From: Santhosh Pulliman Date: Wed, 12 Sep 2018 16:59:55 +0530 Subject: [PATCH 1/2] Added option to skip getting connectionId, since signalr stable version supports bare websocket connection. --- .../WebSocketHubConnectionP2.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dotnetcoresignalrclientjava/src/main/java/com/smartarmenia/dotnetcoresignalrclientjava/WebSocketHubConnectionP2.java b/dotnetcoresignalrclientjava/src/main/java/com/smartarmenia/dotnetcoresignalrclientjava/WebSocketHubConnectionP2.java index 9389a08..f1befb6 100644 --- a/dotnetcoresignalrclientjava/src/main/java/com/smartarmenia/dotnetcoresignalrclientjava/WebSocketHubConnectionP2.java +++ b/dotnetcoresignalrclientjava/src/main/java/com/smartarmenia/dotnetcoresignalrclientjava/WebSocketHubConnectionP2.java @@ -38,10 +38,12 @@ public class WebSocketHubConnectionP2 implements HubConnection { private String connectionId = null; private String authHeader; + private boolean skipConnectionId; - public WebSocketHubConnectionP2(String hubUrl, String authHeader) { + public WebSocketHubConnectionP2(String hubUrl, String authHeader, boolean skipGettingConnectionId) { this.authHeader = authHeader; parsedUri = Uri.parse(hubUrl); + skipConnectionId = skipGettingConnectionId; } @Override @@ -50,7 +52,7 @@ public synchronized void connect() { return; Runnable runnable; - if (connectionId == null) { + if (connectionId == null && !skipConnectionId) { runnable = new Runnable() { public void run() { getConnectionId(); @@ -113,7 +115,9 @@ private void getConnectionId() { private void connectClient() { Uri.Builder uriBuilder = parsedUri.buildUpon(); - uriBuilder.appendQueryParameter("id", connectionId); + if (!skipConnectionId) { + uriBuilder.appendQueryParameter("id", connectionId); + } uriBuilder.scheme(parsedUri.getScheme().replace("http", "ws")); Uri uri = uriBuilder.build(); Map headers = new HashMap<>(); From 6f5c70a1d4ef3aa0fa01d5b8d435cd9193a08ca5 Mon Sep 17 00:00:00 2001 From: Santhosh Pulliman Date: Wed, 12 Sep 2018 17:01:56 +0530 Subject: [PATCH 2/2] Added option to skip getting connectionId, since signalr stable version supports bare websocket connection. --- .../main/java/com/smartarmenia/websocketclient/MainActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/smartarmenia/websocketclient/MainActivity.kt b/app/src/main/java/com/smartarmenia/websocketclient/MainActivity.kt index 53eea3a..6c52a16 100644 --- a/app/src/main/java/com/smartarmenia/websocketclient/MainActivity.kt +++ b/app/src/main/java/com/smartarmenia/websocketclient/MainActivity.kt @@ -30,7 +30,7 @@ class MainActivity : AppCompatActivity(), HubConnectionListener, HubEventListene } private val authHeader = "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1bmlxdWVfbmFtZSI6Ijc5NzhjMjI3LWViMGItNGMwOS1iYWEyLTEwYmE0MjI4YWE4OSIsImNlcnRzZXJpYWxudW1iZXIiOiJtYWNfYWRkcmVzc19vZl9waG9uZSIsInNlY3VyaXR5U3RhbXAiOiJlMTAxOWNiYy1jMjM2LTQ0ZTEtYjdjYy0zNjMxYTYxYzMxYmIiLCJuYmYiOjE1MDYyODQ4NzMsImV4cCI6NDY2MTk1ODQ3MywiaWF0IjoxNTA2Mjg0ODczLCJpc3MiOiJCbGVuZCIsImF1ZCI6IkJsZW5kIn0.QUh241IB7g3axLcfmKR2899Kt1xrTInwT6BBszf6aP4" - private val connection: HubConnection = WebSocketHubConnectionP2("http://192.168.1.8:5002/signalr/hubs/auth", authHeader) + private val connection: HubConnection = WebSocketHubConnectionP2("http://192.168.1.8:5002/signalr/hubs/auth", authHeader, false) override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState)