Merge branch 'feature/no-connection-serial' into feature/no-connectio…

…n-serial-recovery-key
ably · Nov 28, 2023 · 1897227 · 1897227
2 parents c767de2 + 6461967
commit 1897227
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 0 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
@@ -272,6 +272,26 @@ public void transferToChannels(List<ConnectionManager.QueuedMessage> queuedMessa
         private void clear() {
             map.clear();
         }
+
+        protected void setChannelSerialsFromRecoverOption(HashMap<String, String> serials) {
+            for (Map.Entry<String, String> entry : serials.entrySet()) {
+                String channelName = entry.getKey();
+                String channelSerial = entry.getValue();
+                Channel channel = this.get(channelName);
+                if (channel != null) {
+                    channel.properties.channelSerial = channelSerial;
+                }
+            }
+        }
+
+        protected HashMap<String, String> getChannelSerials() {
+            HashMap<String, String> channelSerials = new HashMap<>();
+            for (Channel channel : this.values()) {
+                channelSerials.put(channel.name, channel.properties.channelSerial);
+            }
+            return channelSerials;
+        }
+
     }
 
     /********************

diff --git a/lib/src/main/java/io/ably/lib/realtime/Connection.java b/lib/src/main/java/io/ably/lib/realtime/Connection.java
@@ -49,7 +49,9 @@ public class Connection extends EventEmitter<ConnectionEvent, ConnectionStateLis
      * for more information.
      * <p>
      * Spec: RTN16b, RTN16c
+     * @deprecated use createRecoveryKey method instead.
      */
+    @Deprecated
     public String recoveryKey;
 
     /**

diff --git a/lib/src/main/java/io/ably/lib/types/ChannelProperties.java b/lib/src/main/java/io/ably/lib/types/ChannelProperties.java
@@ -13,5 +13,13 @@ public class ChannelProperties {
      */
     public String attachSerial;
 
+    /**
+     * ChannelSerial contains the channelSerial from latest ProtocolMessage of action type
+     * Message/PresenceMessage received on the channel.
+     * <p>
+     * Spec: CP2b, RTL15b
+     */
+    public String channelSerial;
+
     public ChannelProperties() {}
 }