From 627a83eba9fe8f30eaed6c2cd2f8005db480f980 Mon Sep 17 00:00:00 2001 From: evgeny Date: Tue, 14 May 2024 09:30:21 +0100 Subject: [PATCH] chore: update `CHANGELOG.md` simplify expression for `getOrDefault` workaround --- CHANGELOG.md | 5 +---- lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java | 6 +----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70a97a77b..d75dff805 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,9 @@ [Full Changelog](https://github.com/ably/ably-java/compare/v1.2.37...v1.2.38) -**Breaking changes:** - -- v1.2.34 is incompatible with older Android API versions [\#1004](https://github.com/ably/ably-java/issues/1004) - **Fixed bugs:** +- v1.2.34-v1.2.37 are incompatible with Android API versions < 24 [\#1004](https://github.com/ably/ably-java/issues/1004) - REST client not attempting fallback hosts upon `httpOpenTimeout` expiry [\#997](https://github.com/ably/ably-java/issues/997) **Closed issues:** diff --git a/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java b/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java index 6af23fccb..8e7c99a63 100644 --- a/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java +++ b/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java @@ -266,11 +266,7 @@ public void transferToChannelQueue(List queuedM for (Channel channel : map.values()) { if (channel.state.isReattachable()) { Log.d(TAG, "reAttach(); channel = " + channel.name); - if (channelQueueMap.containsKey(channel.name)){ - channel.transferQueuedPresenceMessages(channelQueueMap.get(channel.name)); - } else { - channel.transferQueuedPresenceMessages(null); - } + channel.transferQueuedPresenceMessages(channelQueueMap.get(channel.name)); } } }