Merge pull request #977 from ably/fix-reattaching-detached-channels

fix: prevent reattaching of detached channels
ably · Nov 23, 2023 · 654c3b1 · 654c3b1
2 parents 78a7137 + b0e89fc
commit 654c3b1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java b/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java
@@ -256,7 +256,7 @@ public void transferToChannels(List<ConnectionManager.QueuedMessage> queuedMessa
 
             for (Map.Entry<String, Channel> channelEntry : map.entrySet()) {
                 Channel channel = channelEntry.getValue();
-                if (channel.state == ChannelState.attaching || channel.state == ChannelState.attached || channel.state == ChannelState.suspended) {
+                if (channel.state.isReattachable()) {
                     Log.d(TAG, "reAttach(); channel = " + channel.name);
 
                     if (channelQueueMap.containsKey(channel.name)){

diff --git a/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java b/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java
@@ -586,7 +586,7 @@ public void run() {
     /* State changes provoked by ConnectionManager state changes. */
 
     public void setConnected(boolean reattachOnResumeFailure) {
-        if (reattachOnResumeFailure){
+        if (reattachOnResumeFailure && state.isReattachable()){
             attach(true,null);
         } else if (state == ChannelState.suspended) {
             /* (RTL3d) If the connection state enters the CONNECTED state, then

diff --git a/lib/src/main/java/io/ably/lib/realtime/ChannelState.java b/lib/src/main/java/io/ably/lib/realtime/ChannelState.java
@@ -47,4 +47,8 @@ public enum ChannelState {
     public ChannelEvent getChannelEvent() {
         return event;
     }
+
+    public boolean isReattachable() {
+        return this == ChannelState.attaching || this == ChannelState.attached || this == ChannelState.suspended;
+    }
 }