[RTL13] Fix existing impl. for server sent DETACH

1. Removed use of explicitly setting detached state 2. Fixed attachWithTimeout method call, set forcedAttach flag to true
ably · Dec 16, 2024 · e8cb69a · e8cb69a
1 parent 2c0f111
commit e8cb69a
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java b/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java
@@ -244,8 +244,8 @@ private void attachImpl(final boolean forceReattach, final CompletionListener li
         }
 
         // (RTL4i)
-        if (connectionManager.getConnectionState().state == ConnectionState.connecting
-            || connectionManager.getConnectionState().state == ConnectionState.disconnected) {
+        ConnectionState connState = connectionManager.getConnectionState().state;
+        if (connState == ConnectionState.connecting || connState == ConnectionState.disconnected) {
             if (listener != null) {
                 on(new ChannelStateCompletionListener(listener, ChannelState.attached, ChannelState.failed));
             }
@@ -1296,18 +1296,12 @@ void onChannelMessage(ProtocolMessage msg) {
         case detached:
             ChannelState oldState = state;
             switch(oldState) {
+                // RTL13a
                 case attached:
-                case suspended: //RTL13a
-                    /* Unexpected detach, reattach when possible */
-                    setDetached((msg.error != null) ? msg.error : REASON_NOT_ATTACHED);
+                case suspended:
+                    /* Unexpected detach, reattach immediately as per RTL13a */
                     Log.v(TAG, String.format(Locale.ROOT, "Server initiated detach for channel %s; attempting reattach", name));
-                    try {
-                        attachWithTimeout(null);
-                    } catch (AblyException e) {
-                    /* Send message error */
-                        Log.e(TAG, "Attempting reattach threw exception", e);
-                        setDetached(e.errorInfo);
-                    }
+                    attachWithTimeout(true, null);
                     break;
                 case attaching:
                     /* RTL13b says we need to be suspended, but continue to retry */