Fixed heartbeat

Author: Nickolay Savchenko

example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java

@@ -98,7 +98,7 @@ public void connectStomp(View view) {
                     }
                 });
 
-//        compositeDisposable.add(dispLifecycle);
+        compositeDisposable.add(dispLifecycle);
 
         // Receive greetings
         Disposable dispTopic = mStompClient.topic("/topic/greetings")
@@ -111,7 +111,7 @@ public void connectStomp(View view) {
                     Log.e(TAG, "Error on subscribe topic", throwable);
                 });
 
-//        compositeDisposable.add(dispTopic);
+        compositeDisposable.add(dispTopic);
 
         mStompClient.connect(headers);
     }

lib/src/main/java/ua/naiksoftware/stomp/HeartBeatTask.java

@@ -21,6 +21,9 @@ public class HeartBeatTask {
     private int serverHeartbeat = 0;
     private int clientHeartbeat = 0;
 
+    private int serverHeartbeatNew = 0;
+    private int clientHeartbeatNew = 0;
+
     private transient long lastServerHeartBeat = 0;
 
     private transient Disposable clientSendHeartBeatTask;
@@ -35,19 +38,19 @@ public HeartBeatTask(SendCallback sendCallback, @Nullable FailedListener failedL
     }
 
     public void setServerHeartbeat(int serverHeartbeat) {
-        this.serverHeartbeat = serverHeartbeat;
+        this.serverHeartbeatNew = serverHeartbeat;
     }
 
     public void setClientHeartbeat(int clientHeartbeat) {
-        this.clientHeartbeat = clientHeartbeat;
+        this.clientHeartbeatNew = clientHeartbeat;
     }
 
     public int getServerHeartbeat() {
-        return serverHeartbeat;
+        return serverHeartbeatNew;
     }
 
     public int getClientHeartbeat() {
-        return clientHeartbeat;
+        return clientHeartbeatNew;
     }
 
     public boolean consumeHeartBeat(StompMessage message) {
@@ -96,13 +99,13 @@ private void heartBeatHandshake(final String heartBeatHeader) {
         if (heartBeatHeader != null) {
             // The heart-beat header is OPTIONAL
             final String[] heartbeats = heartBeatHeader.split(",");
-            if (clientHeartbeat > 0) {
+            if (clientHeartbeatNew > 0) {
                 //there will be heart-beats every MAX(<cx>,<sy>) milliseconds
-                clientHeartbeat = Math.max(clientHeartbeat, Integer.parseInt(heartbeats[1]));
+                clientHeartbeat = Math.max(clientHeartbeatNew, Integer.parseInt(heartbeats[1]));
             }
-            if (serverHeartbeat > 0) {
+            if (serverHeartbeatNew > 0) {
                 //there will be heart-beats every MAX(<cx>,<sy>) milliseconds
-                serverHeartbeat = Math.max(serverHeartbeat, Integer.parseInt(heartbeats[0]));
+                serverHeartbeat = Math.max(serverHeartbeatNew, Integer.parseInt(heartbeats[0]));
             }
         }
         if (clientHeartbeat > 0 || serverHeartbeat > 0) {

lib/src/main/java/ua/naiksoftware/stomp/StompClient.java

@@ -119,6 +119,7 @@ public void connect(@Nullable List<StompHeader> _headers) {
 
                             connectionProvider.send(new StompMessage(StompCommand.CONNECT, headers, null).compile(legacyWhitespace))
                                     .subscribe(() -> {
+                                        Log.d(TAG, "Publish open");
                                         lifecyclePublishSubject.onNext(lifecycleEvent);
                                     });
                             break;