Change to use scheduleWithFixedDelay

Author: mythz

src/AndroidClient/android/src/main/java/net/servicestack/client/sse/ServerEventsClient.java

@@ -573,12 +573,12 @@ private void startNewHeartbeat() {
         if (heartbeatTimer == null)
             heartbeatTimer = new ScheduledThreadPoolExecutor(1);
 
-        heartbeatTimer.schedule(new Runnable() {
+        heartbeatTimer.scheduleWithFixedDelay(new Runnable() {
             @Override
             public void run() {
                 Heartbeat();
             }
-        }, connectionInfo.getHeartbeatIntervalMs(), TimeUnit.MILLISECONDS);
+        }, connectionInfo.getHeartbeatIntervalMs(), connectionInfo.getHeartbeatIntervalMs(), TimeUnit.MILLISECONDS);
     }
 
     public void Heartbeat(){
@@ -621,8 +621,6 @@ public void Heartbeat(){
             if (Log.isDebugEnabled())
                 Log.d("[SSE-CLIENT] Heartbeat sent to: " + heartbeatUrl);
 
-            startNewHeartbeat();
-
         } catch (Exception e) {
             if (Log.isDebugEnabled())
                 Log.d("[SSE-CLIENT] Error from Heartbeat: " + e);

src/AndroidClient/client/src/main/java/net/servicestack/client/sse/ServerEventsClient.java

@@ -573,12 +573,12 @@ private void startNewHeartbeat() {
         if (heartbeatTimer == null)
             heartbeatTimer = new ScheduledThreadPoolExecutor(1);
 
-        heartbeatTimer.schedule(new Runnable() {
+        heartbeatTimer.scheduleWithFixedDelay(new Runnable() {
             @Override
             public void run() {
                 Heartbeat();
             }
-        }, connectionInfo.getHeartbeatIntervalMs(), TimeUnit.MILLISECONDS);
+        }, connectionInfo.getHeartbeatIntervalMs(), connectionInfo.getHeartbeatIntervalMs(), TimeUnit.MILLISECONDS);
     }
 
     public void Heartbeat(){
@@ -621,8 +621,6 @@ public void Heartbeat(){
             if (Log.isDebugEnabled())
                 Log.d("[SSE-CLIENT] Heartbeat sent to: " + heartbeatUrl);
 
-            startNewHeartbeat();
-
         } catch (Exception e) {
             if (Log.isDebugEnabled())
                 Log.d("[SSE-CLIENT] Error from Heartbeat: " + e);