Fixed deltadecode failure recovery test

ably · Jan 30, 2024 · d13051f · d13051f
1 parent f92ab59
commit d13051f
Showing 1 changed file with 6 additions and 3 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
@@ -251,10 +251,11 @@ private void attachImpl(final boolean forceReattach, final CompletionListener li
                 attachMessage.setFlags(options.getModeFlags());
             }
         }
-        if(this.decodeFailureRecoveryInProgress) {
-            Log.v(TAG, "attach(); message decode recovery in progress.");
-        }
         attachMessage.channelSerial = properties.channelSerial; // RTL4c1
+        if(this.decodeFailureRecoveryInProgress) { // RTL18c
+            Log.v(TAG, "attach(); message decode recovery in progress, setting last message channelserial");
+            attachMessage.channelSerial = this.lastPayloadProtocolMessageChannelSerial;
+        }
         try {
             if (listener != null) {
                 on(new ChannelStateCompletionListener(listener, ChannelState.attached, ChannelState.failed));
@@ -838,6 +839,7 @@ private void onMessage(final ProtocolMessage protocolMessage) {
         }
 
         lastPayloadMessageId = lastMessage.id;
+        lastPayloadProtocolMessageChannelSerial = protocolMessage.channelSerial;
 
         for (final Message msg : messages) {
             this.listeners.onMessage(msg);
@@ -1340,6 +1342,7 @@ public void once(ChannelState state, ChannelStateListener listener) {
      */
     private Set<ChannelMode> modes;
     private String lastPayloadMessageId;
+    private String lastPayloadProtocolMessageChannelSerial;
     private boolean decodeFailureRecoveryInProgress;
     private final DecodingContext decodingContext;
 }